You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2018/01/05 23:04:27 UTC
[31/50] [abbrv] ambari git commit: AMBARI-22651 Unable to add/change
role for user. (atkach)
AMBARI-22651 Unable to add/change role for user. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ada1ea54
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ada1ea54
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ada1ea54
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: ada1ea543059521b1e93abd208583ae85affd162
Parents: 4a668f0
Author: Andrii Tkach <at...@apache.org>
Authored: Thu Dec 14 12:45:09 2017 +0200
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Fri Jan 5 17:54:16 2018 -0500
----------------------------------------------------------------------
.../ui/admin-web/app/views/userManagement/groupEdit.html | 2 +-
.../ui/admin-web/app/views/userManagement/modals/groupCreate.html | 2 +-
.../ui/admin-web/app/views/userManagement/modals/userCreate.html | 3 ++-
.../resources/ui/admin-web/app/views/userManagement/userEdit.html | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ada1ea54/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html
index 3eca354..4688eb5 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html
@@ -50,7 +50,7 @@
<editable-list items-source="group.editingUsers" resource-type="User" editable="group.group_type == 'LOCAL'"></editable-list>
</div>
</div>
- <div class="form-group">
+ <div class="form-group" ng-show="cluster">
<label for="role" class="col-sm-2 roles-label">
{{'groups.role' | translate}}
<i class="fa fa-question-circle" aria-hidden="true" ng-click="showHelpPage()"></i>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ada1ea54/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/groupCreate.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/groupCreate.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/groupCreate.html
index 7692a68..8ea1b37 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/groupCreate.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/groupCreate.html
@@ -58,7 +58,7 @@
</div>
</div>
- <div class="row">
+ <div class="row" ng-show="cluster">
<div class="form-group col-sm-6"
ng-class="{ 'has-error': form.groupCreateForm.role.$error.required && form.groupCreateForm.submitted }">
<label for="role" class="nowrap roles-label">
http://git-wip-us.apache.org/repos/asf/ambari/blob/ada1ea54/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/userCreate.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/userCreate.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/userCreate.html
index b1b5876..2e5bba6 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/userCreate.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/userCreate.html
@@ -38,6 +38,7 @@
tooltip="{{'users.userNameTip' | translate}}"
autocomplete="off"
tooltip-trigger="focus"
+ tooltip-placement="top"
class="form-control"
ng-model="formData.userName"
name="userName"
@@ -98,7 +99,7 @@
</div>
</div>
- <div class="row">
+ <div class="row" ng-show="cluster">
<div class="form-group col-sm-6"
ng-class="{ 'has-error': form.userCreateForm.role.$error.required && form.userCreateForm.submitted }">
<label for="role" class="nowrap roles-label">
http://git-wip-us.apache.org/repos/asf/ambari/blob/ada1ea54/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html
index 300046d..80e2196 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html
@@ -70,7 +70,7 @@
</div>
</div>
- <div class="form-group">
+ <div class="form-group" ng-show="cluster">
<label for="role" class="col-sm-2 roles-label">
{{'users.role' | translate}}
<i class="fa fa-question-circle" aria-hidden="true" ng-click="showHelpPage()"></i>