瀏覽代碼

HUE-6758 [jb] Open a workflow workspace breaks the history

Enrico Berti 8 年之前
父節點
當前提交
ac34e4cb2a

+ 6 - 3
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -1633,8 +1633,9 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
           if (data.status == 0) {
             vm.interface(interface);
             vm.job(new Job(vm, data.app));
-
-            hueUtils.changeURL('#!id=' + vm.job().id());
+            if (window.location.hash !== '#!id=' + vm.job().id()) {
+              hueUtils.changeURL('#!id=' + vm.job().id());
+            }
             var crumbs = [];
 
             if (/^attempt_/.test(vm.job().id())) {
@@ -2200,7 +2201,9 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
         self.resetBreadcrumbs();
         % if not is_mini:
         huePubSub.publish('graph.stop.refresh.view');
-        hueUtils.changeURL('#!' + interface);
+        if (window.location.hash !== '#!' + interface) {
+          hueUtils.changeURL('#!' + interface);
+        }
         % endif
         self.job(null);
         if (interface === 'slas'){

+ 1 - 1
apps/oozie/src/oozie/templates/editor2/workflow_editor.mako

@@ -715,7 +715,7 @@ ${ utils.submit_popup_event() }
 
   function renderChangeables() {
     resizeDrops();
-    if (viewModel.workflow.properties.show_arrows()){
+    if (viewModel.workflow && viewModel.workflow.properties && viewModel.workflow.properties.show_arrows()){
       viewModel.drawArrows();
     }
     $("#oozie_workflowComponents .widget-main-section").removeClass("zoom-in");