Просмотр исходного кода

HUE-4954 [oozie] List workflow dashboard coming from a coordinator pointing to a document

Romain Rigaux 9 лет назад
Родитель
Сommit
486f85b
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      apps/oozie/src/oozie/models2.py
  2. 2 2
      apps/oozie/src/oozie/views/dashboard.py

+ 1 - 1
apps/oozie/src/oozie/models2.py

@@ -450,7 +450,7 @@ class Workflow(Job):
     return force_unicode(xml.strip())
 
   def get_absolute_url(self):
-    return reverse('oozie:edit_workflow') + '?workflow=%s' % self.id
+    return reverse('oozie:edit_workflow') + '?workflow=%s' % self.id if self.document else ''
 
   def override_subworkflow_id(self, sub_wf_action, workflow_id):
     _data = self.get_data()

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

@@ -322,10 +322,10 @@ def list_oozie_workflow(request, job_id):
       hue_coord = get_history().get_coordinator_from_config(oozie_workflow.conf_dict)
       hue_workflow = get_history().get_workflow_from_config(oozie_workflow.conf_dict)
       # When a workflow is submitted by a coordinator
-      if not hue_workflow and hue_coord:
+      if not hue_workflow and hue_coord and hue_coord.workflow.document:
         hue_workflow = hue_coord.workflow
 
-      if hue_coord and hue_coord.workflow: hue_coord.workflow.document.doc.get().can_read_or_exception(request.user)
+      if hue_coord and hue_coord.workflow and hue_coord.workflow.document: hue_coord.workflow.document.doc.get().can_read_or_exception(request.user)
       if hue_workflow: hue_workflow.document.doc.get().can_read_or_exception(request.user)
 
       if hue_workflow: