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/08/12 19:46:16 UTC

[1/2] ambari git commit: AMBARI-12748. Cannot grant cluster read-only permission to users in Admin View (IE 10) (alexantonenko)

Repository: ambari
Updated Branches:
  refs/heads/trunk 049bfa8a6 -> 1b6c479f7


AMBARI-12748. Cannot grant cluster read-only permission to users in Admin View (IE 10) (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 2deb2437b93b9e9c0d6d707a86881863b10f00a6
Parents: 049bfa8
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Aug 12 20:40:25 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Aug 12 20:40:25 2015 +0300

----------------------------------------------------------------------
 .../resources/ui/admin-web/app/scripts/directives/editableList.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2deb2437/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/editableList.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/editableList.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/editableList.js
index e223426..18fb7a8 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/editableList.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/editableList.js
@@ -138,7 +138,7 @@ angular.module('ambariAdminConsole')
           var newValue = newValue.split(',').filter(function(i){ 
             i = i.replace('&nbsp;', ''); // Sanitize from spaces
             return !!i.trim();
-          });
+          }).map(function(i) { return i.trim(); });
           if( newValue.length > 1){
             // If someone paste coma separated string, then just add all items to list
             angular.forEach(newValue, function(item) {


[2/2] ambari git commit: AMBARI-12749. Add Service Wizard review page issue when Oozie select to add. (alexantonenko)

Posted by al...@apache.org.
AMBARI-12749. Add Service Wizard review page issue when Oozie select to add. (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 1b6c479f72c1a0adc0d9ed0f6f9cb1ddbac9cc52
Parents: 2deb243
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Aug 12 20:43:43 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Aug 12 20:43:43 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/utils/config.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1b6c479f/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index aefda8c..06fa9af 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -564,7 +564,10 @@ App.config = Em.Object.create({
   mergePreDefinedWithStack: function (selectedServiceNames) {
     var mergedConfigs = [];
 
-    var uiPersistentProperties = ['oozie_hostname_oozie-env', 'oozie_ambari_database_oozie-env'];
+    var uiPersistentProperties = [
+      this.configId('oozie_hostname', 'oozie-env.xml'),
+      this.configId('oozie_ambari_database', 'oozie-env.xml')
+    ];
     var configTypes = App.StackService.find().filter(function(service) {
       return selectedServiceNames.contains(service.get('serviceName'));
     }).map(function(item) {