From d4f2fa25eda1f257456ab0f4307e416757b6859f Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 14 Apr 2016 18:14:24 +0000
Subject: [PATCH] Task #8887: mom2object_id
---
SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py | 2 ++
.../lib/static/app/controllers/gridcontroller.js | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py
index f4f1095bc92..2d0bf912487 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py
@@ -61,6 +61,8 @@ def updateTaskMomDetails(task, momrpc):
t['name'] = m['object_name']
t['project_name'] = m['project_name']
t['project_mom_id'] = m['project_mom2id']
+ t['mom2object_id'] = m['object_mom2objectid']
+ t['mom_object_group_id'] = m['object_group_id']
else:
t['project_name'] = 'OTDB Only'
t['project_mom_id'] = -98
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js
index 074b22611e8..6f0ea2a138b 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js
@@ -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&mom2Id={{row.entity[col.field]}}">{{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