浏览代码

AMBARI-13203. Ambari Pig View - Explain PigScript - Script Details - Shows the pig command instead of pig script. (Nitiraj Singh Rathore via yusaku)

Yusaku Sako 9 年之前
父节点
当前提交
93f86a487e
共有 1 个文件被更改,包括 16 次插入12 次删除
  1. 16 12
      contrib/views/pig/src/main/resources/ui/pig-web/app/controllers/scriptJob.js

+ 16 - 12
contrib/views/pig/src/main/resources/ui/pig-web/app/controllers/scriptJob.js

@@ -21,18 +21,22 @@ var App = require('app');
 App.ScriptJobController = Em.ObjectController.extend(App.FileHandler,{
 App.ScriptJobController = Em.ObjectController.extend(App.FileHandler,{
   fullscreen:false,
   fullscreen:false,
   scriptContents:function () {
   scriptContents:function () {
-    var promise = new Ember.RSVP.Promise(function(resolve,reject){
-      return this.get('content.pigScript').then(function (pigScript) {
-        return resolve(pigScript);
-      },function (error) {
-        var response = (error.responseJSON)?error.responseJSON:{};
-        reject(response.message);
-        if (error.status != 404) {
-          controller.send('showAlert', {'message': Em.I18n.t('job.alert.promise_error',
-            {status:response.status, message:response.message}), status:'error', trace: response.trace});
-        }
-      }.bind(this));
-    }.bind(this));
+    var job = this.get('content'),
+        controller = this,
+        promise = new Ember.RSVP.Promise(function (resolve,reject){
+          var file = (job.get('jobType') !== 'explain') ? job.get('pigScript') : job.store.find('file',[job.get('statusDir'),'source.pig'].join('/'));
+
+          return file.then(function (data) {
+            resolve(data);
+          },function (error) {
+            var response = (error.responseJSON)?error.responseJSON:{};
+            reject(response.message);
+            if (error.status != 404) {
+              controller.send('showAlert', {'message': Em.I18n.t('job.alert.promise_error',
+                {status:response.status, message:response.message}), status:'error', trace: response.trace});
+            }
+          });
+        });
     return Ember.ObjectProxy.extend(Ember.PromiseProxyMixin).create({
     return Ember.ObjectProxy.extend(Ember.PromiseProxyMixin).create({
       promise: promise
       promise: promise
     });
     });