ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject git commit: AMBARI-7655. Jobs View: adjust for no direct access to "properties". (akovalenko)
Date Tue, 14 Oct 2014 11:12:22 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk f8acccbab -> 1ad425fc3


AMBARI-7655. Jobs View: adjust for no direct access to "properties". (akovalenko)


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

Branch: refs/heads/trunk
Commit: 1ad425fc3a284490130bad2ac2177c3df07b19e7
Parents: f8acccb
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Tue Oct 14 12:56:07 2014 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Tue Oct 14 14:03:59 2014 +0300

----------------------------------------------------------------------
 .../views/jobs/src/main/resources/ui/app/scripts/helpers/ajax.js | 2 +-
 .../ui/app/scripts/mappers/application_status_mapper.js          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1ad425fc/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 3caecb1..64a8734 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
@@ -110,7 +110,7 @@ var urls = {
   },
 
   'instance_parameters': {
-    real: 'views/{view}/versions/{version}/instances/{instanceName}',
+    real: 'views/{view}/versions/{version}/instances/{instanceName}/resources/status',
     mock: ''
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ad425fc/contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/application_status_mapper.js
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/application_status_mapper.js
b/contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/application_status_mapper.js
index 935f2a1..80375b8 100644
--- a/contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/application_status_mapper.js
+++ b/contrib/views/jobs/src/main/resources/ui/app/scripts/mappers/application_status_mapper.js
@@ -138,8 +138,8 @@ App.ApplicationStatusMapper = Em.Object.createWithMixins(App.RunPeriodically,
{
    * @method getInstanceParametersSuccessCallback
    */
   getInstanceParametersSuccessCallback: function (data) {
-    var atsURLParameter = data.ViewInstanceInfo.properties['yarn.ats.url'];
-    var resourceManagerURLParameter = data.ViewInstanceInfo.properties['yarn.resourcemanager.url'];
+    var atsURLParameter = data.properties['yarn.ats.url'];
+    var resourceManagerURLParameter = data.properties['yarn.resourcemanager.url'];
     if (atsURLParameter) {
       App.set('atsURL', atsURLParameter);
       App.set('resourceManagerURL', resourceManagerURLParameter);


Mime
View raw message