diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js index 0f9d94b3d0bd625ce8d8eee3f57cc503ce823447..01c765237718913461df29c709b00635cb00f793 100644 --- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js +++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js @@ -692,7 +692,7 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http, self.getMoMProjects = function() { var defer = $q.defer(); - $http.get('/rest/momprojects').success(function(result) { + $http.get('/rest/projects').success(function(result) { //convert datetime strings to Date objects var dict = {}; var list = []; @@ -726,7 +726,7 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http, self.getProjectDiskUsage = function(project_name) { var defer = $q.defer(); - $http.get('/rest/momprojects/' + project_name + '/diskusage').success(function(result) { + $http.get('/rest/projects/' + project_name + '/diskusage').success(function(result) { defer.resolve(result); }).error(function(result) { defer.resolve({found:false}); @@ -737,7 +737,7 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http, self.getProjectsDiskUsage = function() { var defer = $q.defer(); - $http.get('/rest/momprojects/diskusage').success(function(result) { + $http.get('/rest/projects/diskusage').success(function(result) { defer.resolve(result); }).error(function(result) { defer.resolve({found:false}); diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/webservice.py b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/webservice.py index 146ef8a2a7958e93d5dc4ff4579c7bc5aee3ce1f..3b72fd889224f6390f167d0d3a592f96e5b61668 100755 --- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/webservice.py +++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/webservice.py @@ -478,7 +478,7 @@ def resourceclaimpropertytypes(): result = sorted(result, key=lambda q: q['id']) return jsonify({'resourceclaimpropertytypes': result}) -@app.route('/rest/momprojects') +@app.route('/rest/projects') @gzipped def getMoMProjects(): projects = [] @@ -494,7 +494,7 @@ def getMoMProjects(): projects.append({'name':'OTDB Only', 'mom_id':-98, 'description': 'Container project for tasks which exists only in OTDB'}) return jsonify({'momprojects': projects}) -@app.route('/rest/momprojects/<int:project_mom2id>') +@app.route('/rest/projects/<int:project_mom2id>') @gzipped def getMoMProject(project_mom2id): try: @@ -508,7 +508,7 @@ def getMoMProject(project_mom2id): logger.error(e) abort(404, str(e)) -@app.route('/rest/momprojects/<int:project_mom2id>/diskusage') +@app.route('/rest/projects/<int:project_mom2id>/diskusage') @gzipped def getMoMProjectDiskUsageById(project_mom2id): try: @@ -522,7 +522,7 @@ def getMoMProjectDiskUsageById(project_mom2id): logger.error(e) abort(404, str(e)) -@app.route('/rest/momprojects/<string:project_name>/diskusage') +@app.route('/rest/projects/<string:project_name>/diskusage') @gzipped def getMoMProjectDiskUsageByName(project_name): try: @@ -532,7 +532,7 @@ def getMoMProjectDiskUsageByName(project_name): logger.error(e) abort(404, str(e)) -@app.route('/rest/momprojects/diskusage') +@app.route('/rest/projects/diskusage') @gzipped def getMoMProjectsDiskUsage(): try: