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 2015/09/16 18:55:25 UTC

[1/2] ambari git commit: AMBARI-13117. “Oozie-HA Quick links" in Ambari points to incorrect URL after enabling SSL (alexantonenko)

Repository: ambari
Updated Branches:
  refs/heads/trunk a249e30f2 -> 8216e4e67


AMBARI-13117. “Oozie-HA Quick links" in Ambari points to incorrect URL after enabling SSL (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 8a615b0c6b93dfaef18afc87ff60cf83ec72e45d
Parents: a249e30
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Sep 16 19:39:37 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Sep 16 19:39:37 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/views/common/quick_view_link_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8a615b0c/ambari-web/app/views/common/quick_view_link_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/quick_view_link_view.js b/ambari-web/app/views/common/quick_view_link_view.js
index 500d6ec..8fe5d0c 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -162,7 +162,7 @@ App.QuickViewLinks = Em.View.extend({
         var quickLinks = [];
         self.get('content.quickLinks').forEach(function (item) {
           var newItem = {};
-          var protocol = self.setProtocol(item.get('service_id'), self.get('configProperties'), self.ambariProperties());
+          var protocol = self.setProtocol(item.get('service_id'), self.get('configProperties'), self.ambariProperties(), item);
           if (item.get('template')) {
             var port;
             var hostNameRegExp = new RegExp('([\\w\\W]*):\\d+');


[2/2] ambari git commit: AMBARI-13118. Add service wizard: js error on review page, that makes impossible to finish this wiz (alexantonenko)

Posted by al...@apache.org.
AMBARI-13118. Add service wizard: js error on review page, that makes impossible to finish this wiz (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 8216e4e6764b8f947b021c26d38901adaaa1a650
Parents: 8a615b0
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Sep 16 19:45:41 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Sep 16 19:45:41 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/utils/configs/config_property_helper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8216e4e6/ambari-web/app/utils/configs/config_property_helper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/configs/config_property_helper.js b/ambari-web/app/utils/configs/config_property_helper.js
index 828e24d..d4ce44a 100644
--- a/ambari-web/app/utils/configs/config_property_helper.js
+++ b/ambari-web/app/utils/configs/config_property_helper.js
@@ -162,7 +162,7 @@ module.exports = {
         }
         break;
       case 'oozie_hostname':
-        configProperty.set('recommendedValue', masterComponentHostsInDB.filterProperty('component', 'OOZIE_SERVER').mapProperty('hostName'));
+        configProperty.set('recommendedValue', masterComponentHostsInDB.filterProperty('component', 'OOZIE_SERVER').mapProperty('hostName')[0]);
       case 'oozieserver_host':
         configProperty.set('value', masterComponentHostsInDB.filterProperty('component', 'OOZIE_SERVER').mapProperty('hostName'));
         break;