Browse Source

AMBARI-10137. Jobs View: "No Tez Information" popup appearing few times (alexantonenko)

Alex Antonenko 10 years ago
parent
commit
e0935981a7

+ 8 - 2
contrib/views/jobs/src/main/resources/ui/app/scripts/controllers/job_controller.js

@@ -52,13 +52,18 @@ App.JobController = Ember.ObjectController.extend(App.RunPeriodically, {
    * @method showPopup
    */
   showPopup: function (title) {
-    Bootstrap.ModalManager.open(
+    var self = this,
+    modal = Bootstrap.ModalManager.open(
       'errorPopup',
       title,
       'job/error_popup',
       this.get('showPopupButtons'),
       this
     );
+    this.stop();
+    modal.on('closed', function ( ) {
+      self.transitionToRoute('jobs');
+    });
   },
 
   /**
@@ -95,11 +100,12 @@ App.JobController = Ember.ObjectController.extend(App.RunPeriodically, {
                 break;
               case 'job.dag.id.loaderror':
               case 'job.dag.name.loaderror':
+                self.transitionToRoute('jobs');
                 break;
               default:
+                self.transitionToRoute('jobs');
                 break;
             }
-            this.transitionToRoute('jobs');
           }
         );
       }