diff --git a/SAS/MoM/MoMQueryService/momqueryservice.py b/SAS/MoM/MoMQueryService/momqueryservice.py index 4425754329f055929c73a0e3d49f05e42cbbd5e0..bfe2c7cfb5206c018773a476fbe7f311a89e23ee 100755 --- a/SAS/MoM/MoMQueryService/momqueryservice.py +++ b/SAS/MoM/MoMQueryService/momqueryservice.py @@ -131,7 +131,7 @@ class MoMDatabaseWrapper: ('\'s' if len(ids) > 1 else '', ids_str)) # TODO: make a view for this query in momdb! - query = '''SELECT project.mom2id as project_mom2id, project.name as project_name, project.description as project_description, + query = '''SELECT project.mom2id as project_mom2id, project.id as project_mom2objectid, project.name as project_name, project.description as project_description, object.mom2id as object_mom2id, object.id as object_mom2objectid, object.name as object_name, object.description as object_description, object.mom2objecttype as object_type, object.group_id as object_group_id FROM mom2object as object left join mom2object as project on project.id = object.ownerprojectid diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py index 2d0bf9124875f1b0ed5eee3a5fcbc5e3bd1136a6..659e1b3e2499681c61f374999c1d3616e07e3087 100644 --- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py +++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py @@ -61,6 +61,7 @@ def updateTaskMomDetails(task, momrpc): t['name'] = m['object_name'] t['project_name'] = m['project_name'] t['project_mom_id'] = m['project_mom2id'] + t['project_mom2object_id'] = m['project_mom2objectid'] t['mom2object_id'] = m['object_mom2objectid'] t['mom_object_group_id'] = m['object_group_id'] else: diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js index 6f0ea2a138b02b3e3354499ed5b6ba68e3253b31..c475f706864a0e259c846485f1892303b9fc1a10 100644 --- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js +++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js @@ -18,7 +18,7 @@ gridControllerMod.controller('GridController', ['$scope', 'dataService', 'uiGrid { field: 'project_name', displayName:'Project', enableCellEdit: false, - cellTemplate:'<a target="_blank" href="https://lofar.astron.nl/mom3/user/project/setUpMom2ObjectDetails.do?view=generalinfo&mom2Id={{row.entity.project_mom_id}}">{{row.entity[col.field]}}</a>', + cellTemplate:'<a target="_blank" href="https://lofar.astron.nl/mom3/user/project/setUpMom2ObjectDetails.do?view=generalinfo&mom2Id={{row.entity.project_mom2object_id}}">{{row.entity[col.field]}}</a>', width: '15%', filter: { type: uiGridConstants.filter.SELECT, @@ -28,7 +28,7 @@ gridControllerMod.controller('GridController', ['$scope', 'dataService', 'uiGrid { field: 'mom_id', displayName: 'MoM ID', enableCellEdit: false, - cellTemplate:'<a target="_blank" href="https://lofar.astron.nl/mom3/user/project/setUpMom2ObjectDetails.do?view=generalinfo&mom2ObjectId={{{{row.entity.mom2object_id}}}}">{{row.entity[col.field]}}</a>', + cellTemplate:'<a target="_blank" href="https://lofar.astron.nl/mom3/user/project/setUpMom2ObjectDetails.do?view=generalinfo&mom2ObjectId={{row.entity.mom2object_id}}">{{row.entity[col.field]}}</a>', width: '7.5%' }, { field: 'otdb_id',