Ver código fonte

AMBARI-7930 Jobs View: queries are not linking. (Buzhor Denys via ababiichuk)

aBabiichuk 10 anos atrás
pai
commit
27a9d78c92

+ 1 - 1
contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/jobs/hive_job_mapper.js

@@ -53,7 +53,7 @@ App.hiveJobMapper = App.QuickDataMapper.create({
       else {
         hiveJob.endTime = json.endtime;
       }
-      json.otherinfo.query = $.parseJSON(json.otherinfo.query);
+      json.otherinfo.query = $.parseJSON(Em.get(json, 'otherinfo.query') || Em.get(json, 'otherinfo.QUERY'));
       if (json.otherinfo.query && json.otherinfo.query.queryText) {
         hiveJob.query_text = json.otherinfo.query.queryText;
       }

+ 4 - 3
contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/jobs/hive_jobs_mapper.js

@@ -23,19 +23,20 @@ App.hiveJobsMapper = App.QuickDataMapper.create({
     user: 'primaryfilters.user',
     hasTezDag: {
       custom: function(source) {
-        var query = Ember.get(source, 'otherinfo.query');
+        var query = Ember.get(source, 'otherinfo.query') || Ember.get(source, 'otherinfo.QUERY');
         return Ember.isNone(query) ? false : query.match("\"Tez\".*\"DagName:\"");
       }
     },
     queryText: {
       custom: function(source) {
-        var query = Ember.get(source, 'otherinfo.query');
+        var query = Ember.get(source, 'otherinfo.query') || Ember.get(source, 'otherinfo.QUERY');
         return Ember.isNone(query) ? '' : $.parseJSON(query).queryText;
       }
     },
     failed: {
       custom: function(source) {
-        return Ember.get(source ,'otherinfo.status') === false;
+        var status = Ember.get(source ,'otherinfo.status') || Ember.get(source ,'otherinfo.STATUS');
+        return status === false;
       }
     },
     startTime: {