Browse Source

HUE-1011 [oozie] Coordinator dashboard Actions tab should have live link for External Id

Added link to external ID
Enrico Berti 13 years ago
parent
commit
c79573a

+ 6 - 3
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako

@@ -212,10 +212,12 @@ ${ layout.menubar(section='dashboard') }
           <td data-bind="text: lastModifiedTime"></td>
           <td data-bind="text: lastModifiedTime"></td>
 
 
           <td>
           <td>
-            <a data-bind="visible:externalId !='', attr: { href: externalIdUrl}, text: id" data-row-selector"true"></a>
+            <a data-bind="visible:externalId !='', attr: { href: url}, text: id" data-row-selector"true"></a>
           </td>
           </td>
 
 
-          <td data-bind="text: externalId"></td>
+          <td>
+            <a data-bind="visible:externalId !='', attr: { href: externalIdUrl}, text: externalId"></a>
+          </td>
 
 
         </tr>
         </tr>
 
 
@@ -310,12 +312,13 @@ ${ layout.menubar(section='dashboard') }
   var Action = function (action) {
   var Action = function (action) {
     return {
     return {
       id: action.id,
       id: action.id,
+      url: action.url,
       number: action.number,
       number: action.number,
       type: action.type,
       type: action.type,
       status: action.status,
       status: action.status,
       statusClass: "label " + getStatusClass(action.status),
       statusClass: "label " + getStatusClass(action.status),
-      externalIdUrl: action.externalIdUrl,
       externalId: action.externalId,
       externalId: action.externalId,
+      externalIdUrl: action.externalIdUrl,
       nominalTime: action.nominalTime,
       nominalTime: action.nominalTime,
       createdTime: action.createdTime,
       createdTime: action.createdTime,
       lastModifiedTime: action.lastModifiedTime,
       lastModifiedTime: action.lastModifiedTime,

+ 2 - 1
apps/oozie/src/oozie/views/dashboard.py

@@ -296,11 +296,12 @@ def massaged_coordinator_actions_for_json(coordinator):
   for action in coordinator_actions:
   for action in coordinator_actions:
     massaged_action = {
     massaged_action = {
       'id': action.id,
       'id': action.id,
+      'url': action.externalId and reverse('oozie:list_oozie_workflow', kwargs={'job_id': action.externalId, 'coordinator_job_id': coordinator_id}) or '',
       'number': action.actionNumber,
       'number': action.actionNumber,
       'type': action.type,
       'type': action.type,
       'status': action.status,
       'status': action.status,
-      'externalIdUrl': action.externalId and reverse('oozie:list_oozie_workflow', kwargs={'job_id': action.externalId, 'coordinator_job_id': coordinator_id}) or '',
       'externalId': action.externalId or '-',
       'externalId': action.externalId or '-',
+      'externalIdUrl': action.externalId and reverse('oozie:list_oozie_workflow_action', kwargs={'action': action.externalId}) or '',
       'nominalTime': format_time(action.nominalTime),
       'nominalTime': format_time(action.nominalTime),
       'createdTime': format_time(action.createdTime),
       'createdTime': format_time(action.createdTime),
       'lastModifiedTime': format_time(action.lastModifiedTime),
       'lastModifiedTime': format_time(action.lastModifiedTime),