ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject git commit: AMBARI-7930 Jobs View: queries are not linking. (Buzhor Denys via ababiichuk)
Date Thu, 23 Oct 2014 18:02:23 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 896d0a2e3 -> 27a9d78c9


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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/27a9d78c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/27a9d78c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/27a9d78c

Branch: refs/heads/trunk
Commit: 27a9d78c921cbfd56fb4dc7e3b440d2a2fe5dbca
Parents: 896d0a2
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Thu Oct 23 19:46:50 2014 +0300
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Thu Oct 23 21:02:14 2014 +0300

----------------------------------------------------------------------
 .../resources/ui/app/scripts/mappers/jobs/hive_job_mapper.js  | 2 +-
 .../resources/ui/app/scripts/mappers/jobs/hive_jobs_mapper.js | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/27a9d78c/contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/jobs/hive_job_mapper.js
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/jobs/hive_job_mapper.js
b/contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/jobs/hive_job_mapper.js
index 059c08a..80d484d 100644
--- a/contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/jobs/hive_job_mapper.js
+++ b/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;
       }

http://git-wip-us.apache.org/repos/asf/ambari/blob/27a9d78c/contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/jobs/hive_jobs_mapper.js
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/jobs/hive_jobs_mapper.js
b/contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/jobs/hive_jobs_mapper.js
index 1cdb76d..f0ddf72 100644
--- a/contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/jobs/hive_jobs_mapper.js
+++ b/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: {


Mime
View raw message