You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2014/11/03 06:11:55 UTC
git commit: AMBARI-8103. Jobs View: Filter for tez jobs needs to work
for both HDP 2.1 and HDP 2.2, which use tez:true, TEZ:true,
respectively (alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk b583fa9f5 -> c3eff5074
AMBARI-8103. Jobs View: Filter for tez jobs needs to work for both HDP 2.1 and HDP 2.2, which use tez:true, TEZ:true, respectively (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c3eff507
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c3eff507
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c3eff507
Branch: refs/heads/trunk
Commit: c3eff50747709fd9ca0ec01bf6cd495155952d7a
Parents: b583fa9
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Sat Nov 1 18:48:07 2014 -0700
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Sun Nov 2 21:11:39 2014 -0800
----------------------------------------------------------------------
.../main/resources/ui/app/scripts/controllers/jobs_controller.js | 4 +++-
.../views/jobs/src/main/resources/ui/app/scripts/helpers/ajax.js | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c3eff507/contrib/views/jobs/src/main/resources/ui/app/scripts/controllers/jobs_controller.js
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/src/main/resources/ui/app/scripts/controllers/jobs_controller.js b/contrib/views/jobs/src/main/resources/ui/app/scripts/controllers/jobs_controller.js
index 6a04c98..e8a86f2 100644
--- a/contrib/views/jobs/src/main/resources/ui/app/scripts/controllers/jobs_controller.js
+++ b/contrib/views/jobs/src/main/resources/ui/app/scripts/controllers/jobs_controller.js
@@ -411,7 +411,9 @@ App.JobsController = Ember.ArrayController.extend(App.RunPeriodically, {
* @method createJobsFiltersLink
*/
createJobsFiltersLink: function () {
- var link = "?fields=events,primaryfilters,otherinfo&secondaryFilter=tez:true",
+ // The filters "tez:true,TEZ:true" are needed because ATS is case sensitive,
+ // and in HDP 2.1, "tez" was used, while in HDP 2.2, "TEZ" was used.
+ var link = "?fields=events,primaryfilters,otherinfo&secondaryFilter=tez:true,TEZ:true",
numberOfAppliedFilters = 0;
if (this.get("id") !== "") {
http://git-wip-us.apache.org/repos/asf/ambari/blob/c3eff507/contrib/views/jobs/src/main/resources/ui/app/scripts/helpers/ajax.js
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/src/main/resources/ui/app/scripts/helpers/ajax.js b/contrib/views/jobs/src/main/resources/ui/app/scripts/helpers/ajax.js
index 64a8734..0c4148c 100644
--- a/contrib/views/jobs/src/main/resources/ui/app/scripts/helpers/ajax.js
+++ b/contrib/views/jobs/src/main/resources/ui/app/scripts/helpers/ajax.js
@@ -50,7 +50,9 @@ var urls = {
},
'jobs_lastID': {
- real: '/views/{view}/{version}/{instanceName}/proxy?url={atsURL}/ws/v1/timeline/HIVE_QUERY_ID?limit=1&secondaryFilter=tez:true',
+ // The filters "tez:true,TEZ:true" are needed because ATS is case sensitive,
+ // and in HDP 2.1, "tez" was used, while in HDP 2.2, "TEZ" was used.
+ real: '/views/{view}/{version}/{instanceName}/proxy?url={atsURL}/ws/v1/timeline/HIVE_QUERY_ID?limit=1&secondaryFilter=tez:true,TEZ:true',
mock: '/scripts/assets/hive-queries.json',
apiPrefix: ''
},