ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject [1/2] ambari git commit: AMBARI-19476. Incorrect error message when trying to add a group to multiple roles (alexantonenko)
Date Mon, 16 Jan 2017 18:36:43 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 38e0b578b -> f5845cc3c


AMBARI-19476. Incorrect error message when trying to add a group to multiple roles (alexantonenko)


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

Branch: refs/heads/branch-2.5
Commit: f5845cc3ce16c3f3e61d9e17a6d86a4579f95684
Parents: e60ac67
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Mon Jan 16 20:28:23 2017 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Mon Jan 16 20:36:37 2017 +0200

----------------------------------------------------------------------
 .../src/main/resources/ui/admin-web/app/scripts/i18n.config.js     | 2 +-
 .../ui/admin-web/app/scripts/services/PermissionsSaver.js          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f5845cc3/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
index a01324b..3bb33e3 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
@@ -354,7 +354,7 @@ angular.module('ambariAdminConsole')
         'ambariAdmin': 'Ambari Administrator',
         'viewUser': 'View User',
         'none': 'None',
-        'oneRolePerUser': 'Only 1 role allowed per user',
+        'oneRolePerUserOrGroup': 'Only 1 role allowed per user or group',
         'permissionLevel': '{{level}}-level Permissions'
       },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f5845cc3/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/PermissionsSaver.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/PermissionsSaver.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/PermissionsSaver.js
index c170235..64abd9d 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/PermissionsSaver.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/PermissionsSaver.js
@@ -66,7 +66,7 @@ angular.module('ambariAdminConsole')
       var deferred = $q.defer();
       deferred.reject({
         data: {
-          message: $t('users.roles.oneRolePerUser')
+          message: $t('users.roles.oneRolePerUserOrGroup')
         }
       });
       return deferred.promise;


Mime
View raw message