From ee59ce2ec58a8ec57f28f2db4479de20ffb40ae1 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 15 Apr 2016 07:14:20 +0000
Subject: [PATCH] Task #8887: mom2object_id for project
---
SAS/MoM/MoMQueryService/momqueryservice.py | 2 +-
SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py | 1 +
.../lib/static/app/controllers/gridcontroller.js | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/SAS/MoM/MoMQueryService/momqueryservice.py b/SAS/MoM/MoMQueryService/momqueryservice.py
index 4425754329f..bfe2c7cfb52 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 2d0bf912487..659e1b3e249 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 6f0ea2a138b..c475f706864 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',
--
GitLab