AMBARI-22566. Upgrade Angular for Ambari Admin View (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a7ac4452 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a7ac4452 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a7ac4452 Branch: refs/heads/branch-3.0-perf Commit: a7ac44525d430a1f5b5144f1699fac99abf67ebf Parents: 1c9aa9d Author: Alex Antonenko <aantone...@hortonworks.com> Authored: Tue Dec 5 17:59:12 2017 +0300 Committer: Alex Antonenko <aantone...@hortonworks.com> Committed: Tue Dec 5 17:59:12 2017 +0300 ---------------------------------------------------------------------- .../main/resources/ui/admin-web/app/scripts/app.js | 2 +- .../stackVersions/StackVersionsEditCtrl.js | 2 +- .../ui/admin-web/app/views/ambariViews/edit.html | 8 ++++---- .../admin-web/app/views/ambariViews/viewsList.html | 2 +- .../app/views/directives/editableList.html | 2 +- .../app/views/modals/AddRepositoryModal.html | 2 +- .../app/views/modals/RoleDetailsModal.html | 2 +- .../ui/admin-web/app/views/remoteClusters/list.html | 2 +- .../ui/admin-web/app/views/stackVersions/list.html | 4 ++-- .../app/views/stackVersions/stackVersionPage.html | 4 ++-- .../app/views/userManagement/groupEdit.html | 12 ++++++------ .../app/views/userManagement/groupsList.html | 6 +++--- .../views/userManagement/modals/changePassword.html | 2 +- .../app/views/userManagement/userEdit.html | 16 ++++++++-------- .../app/views/userManagement/usersList.html | 4 ++-- .../src/main/resources/ui/admin-web/bower.json | 11 +++++++---- .../src/main/resources/ui/admin-web/package.json | 2 +- 17 files changed, 43 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js index 225eb12..98b0383 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js @@ -63,7 +63,7 @@ angular.module('ambariAdminConsole', [ }; }]); - $httpProvider.responseInterceptors.push(['$rootScope', '$q', function (scope, $q) { + $httpProvider.interceptors.push(['$rootScope', '$q', function (scope, $q) { function success(response) { return response; } http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js index 542772e..a4b121c 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js @@ -36,7 +36,7 @@ angular.module('ambariAdminConsole') $scope.isGPLAccepted = false; $scope.isGPLRepo = function (repository) { - return repository.Repositories.tags.indexOf('GPL') >= 0; + return repository.Repositories.tags && repository.Repositories.tags.indexOf('GPL') >= 0; }; $scope.showRepo = function (repository) { http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html index a86e285..7f2f8a3 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html @@ -26,8 +26,8 @@ </li> </ol> <div class="pull-right top-margin-4" ng-switch="instance.ViewInstanceInfo.static"> - <button ng-switch-when="true" class="btn disabled btn-default btn-delete-instance" tooltip="{{'views.alerts.cannotDeleteStaticInstance' | translate}}">{{'common.delete' | translate: '{term: instanceType}'}}</button> - <button ng-switch-when="false" class="btn btn-danger" ng-click="deleteInstance(instance)">{{'common.delete' | translate: '{term: constants.instance}'}}</button> + <button ng-switch-when="true" class="btn disabled btn-default btn-delete-instance" tooltip="{{'views.alerts.cannotDeleteStaticInstance' | translate}}">{{'common.delete' | translate:{term: instanceType} }}</button> + <button ng-switch-when="false" class="btn btn-danger" ng-click="deleteInstance(instance)">{{'common.delete' | translate:{term: constants.instance} }}</button> </div> </div> <hr> @@ -241,7 +241,7 @@ </fieldset> </form> <div ng-show="isConfigurationEmpty && !clusterConfigurable"> - <div class="alert alert-info">{{'views.alerts.notDefined' | translate: '{term: constants.props}'}}</div> + <div class="alert alert-info">{{'views.alerts.notDefined' | translate:{term: constants.props} }}</div> </div> </div> </div> @@ -296,7 +296,7 @@ <span translate="views.clusterPermissions.nonLocalClusterMessage"></span> </div> <div ng-show="isPermissionsEmpty"> - <div class="alert alert-info">{{'views.alerts.notDefined' | translate: '{term: constants.perms}'}}</div> + <div class="alert alert-info">{{'views.alerts.notDefined' | translate:{term: constants.perms} }}</div> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/viewsList.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/viewsList.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/viewsList.html index 04901f1..ae57b86 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/viewsList.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/viewsList.html @@ -137,7 +137,7 @@ </div> <div class="col-sm-12 table-bar" ng-show="instances.length >= minInstanceForPagination"> <div class="pull-left filtered-info"> - <span>{{'common.filterInfo' | translate: '{showed: tableInfo.showed, total: tableInfo.filtered, term: urs.urls}'}}</span> + <span>{{'common.filterInfo' | translate:{showed: tableInfo.showed, total: tableInfo.filtered, term: urs.urls} }}</span> <span ng-show="isNotEmptyFilter">- <a href ng-click="clearFilters()">{{'common.controls.clearFilters' | translate}}</a></span> </div> <div class="pull-right left-margin"> http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/views/directives/editableList.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/directives/editableList.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/directives/editableList.html index 5f482ef..7b4413f 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/directives/editableList.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/directives/editableList.html @@ -27,7 +27,7 @@ </ul> </div> </li> - <li class="item add-item" ng-show="!editMode && !items.length">{{'common.add' | translate: '{term: resourceType}'}}</li> + <li class="item add-item" ng-show="!editMode && !items.length">{{'common.add' | translate:{term: resourceType} }}</li> </ul> </div> <div class="actions-panel" ng-show="editMode"> http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/AddRepositoryModal.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/AddRepositoryModal.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/AddRepositoryModal.html index 5639a3f..4434d28 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/AddRepositoryModal.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/AddRepositoryModal.html @@ -21,7 +21,7 @@ <form class="form-horizontal" name="addRepoForm" novalidate> <div class="modal-body"> <div class="alert alert-warning hide-soft" ng-class="{'visible' : showAlert}" role="alert"> - {{'versions.alerts.repositoryExists' | translate: '{os: repo.selectedOS}'}} + {{'versions.alerts.repositoryExists' | translate:{os: repo.selectedOS} }} </div> <div class="form-group"> <div class="col-sm-3"> http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html index 942a733..61bd2d0 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html @@ -36,7 +36,7 @@ <div ng-repeat="level in orderedLevels"> <div class="table-row-wrapper table-section-title"> <div class="table-row"> - <div class="table-cell" colspan="{{roles.length + 1}}">{{'users.roles.permissionLevel' | translate: '{level: getLevelName(level)}'}}</div> + <div class="table-cell" colspan="{{roles.length + 1}}">{{'users.roles.permissionLevel' | translate:{level: getLevelName(level)} }}</div> </div> </div> <div class="table-row-wrapper"> http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/views/remoteClusters/list.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/remoteClusters/list.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/remoteClusters/list.html index 59d8acb..67d650e 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/remoteClusters/list.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/remoteClusters/list.html @@ -63,7 +63,7 @@ </div> <div class="col-sm-12 table-bar"> <div class="pull-left filtered-info"> - <span>{{'common.filterInfo' | translate: '{showed: tableInfo.showed, total: tableInfo.total, term: constants.groups}'}}</span> + <span>{{'common.filterInfo' | translate:{showed: tableInfo.showed, total: tableInfo.total, term: constants.groups} }}</span> <span ng-show="isNotEmptyFilter">- <a href ng-click="clearFilters()">{{'common.controls.clearFilters' | translate}}</a></span> </div> <div class="pull-right left-margin"> http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html index cf5c516..279343b 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html @@ -121,11 +121,11 @@ <i class="fa fa-2x fa-spinner fa-spin" aria-hidden="true"></i> </div> <div class="alert empty-table-alert col-sm-12" ng-show="!repos.length && !isLoading"> - {{'common.alerts.nothingToDisplay' | translate: '{term: getConstant("common.version")}'}} + {{'common.alerts.nothingToDisplay' | translate:{term: getConstant("common.version")} }} </div> <div class="col-sm-12 table-bar"> <div class="pull-left filtered-info"> - <span>{{'common.filterInfo' | translate: '{showed: tableInfo.showed, total: tableInfo.total, term: getConstant("common.versions")}'}}</span> + <span>{{'common.filterInfo' | translate:{showed: tableInfo.showed, total: tableInfo.total, term: getConstant("common.versions")} }}</span> <span ng-show="isNotEmptyFilter">- <a href ng-click="clearFilters()">{{'common.controls.clearFilters' | translate}}</a></span> </div> <div class="pull-right left-margin"> http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html index da1ab3f..0f06f7c 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html @@ -96,10 +96,10 @@ <span class="dot">.</span> <div class="form-group" ng-class="{'has-error' : versionRegForm.version.$error.pattern}"> <input class="form-control" name="version" type="text" ng-model="activeStackVersion.editableDisplayName" ng-pattern="activeStackVersion.subVersionPattern" - placeholder="{{'versions.placeholder' | translate: '{pattern: activeStackVersion.pattern}'}}" ng-change="updateCurrentVersionInput()" required/> + placeholder="{{'versions.placeholder' | translate:{pattern: activeStackVersion.pattern} }}" ng-change="updateCurrentVersionInput()" required/> </div> <div class="text-danger" ng-show="versionRegForm.version.$error.pattern"> -  {{'common.alerts.isInvalid' | translate: '{term: activeStackVersion.displayName}'}} +  {{'common.alerts.isInvalid' | translate:{term: activeStackVersion.displayName} }} </div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/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 5656417..3eca354 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 @@ -27,11 +27,11 @@ <button ng-switch-when="true" class="btn disabled deletegroup-btn" - tooltip="{{'common.cannotDelete' | translate: '{term: constants.group}'}}"> - {{'common.delete' | translate: '{term: constants.group}'}} + tooltip="{{'common.cannotDelete' | translate:{term: constants.group} }}"> + {{'common.delete' | translate:{term: constants.group} }} </button> <button ng-switch-when="false" class="btn btn-danger deletegroup-btn" ng-click="deleteGroup(group)"> - {{'common.delete' | translate: '{term: constants.group}'}} + {{'common.delete' | translate:{term: constants.group} }} </button> </div> </div> @@ -86,7 +86,7 @@ </td> </tr> <tr> - <td ng-show="noClusterPriv">{{'common.alerts.noPrivileges' | translate: '{term: constants.cluster}'}}</td> + <td ng-show="noClusterPriv">{{'common.alerts.noPrivileges' | translate:{term: constants.cluster} }}</td> </tr> </tbody> <thead class="view-permission-header"> @@ -109,12 +109,12 @@ </td> </tr> <tr> - <td ng-show="noViewPriv">{{'common.alerts.noPrivileges' | translate: '{term: constants.view}'}}</td> + <td ng-show="noViewPriv">{{'common.alerts.noPrivileges' | translate:{term: constants.view} }}</td> </tr> </tbody> </table> <div class="alert alert-info" ng-show="hidePrivileges"> - {{'common.alerts.noPrivilegesDescription' | translate: '{term: constants.group.toLowerCase()}'}} + {{'common.alerts.noPrivilegesDescription' | translate:{term: constants.group.toLowerCase()} }} </div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupsList.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupsList.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupsList.html index d79d14e..af8303d 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupsList.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupsList.html @@ -61,7 +61,7 @@ <span>{{group.group_name}}</span> </td> <td class="col-sm-2">{{group.groupTypeName | translate}}</td> - <td class="col-sm-2">{{'groups.membersPlural' | translate: '{n: group.members && group.members.length || 0}'}}</td> + <td class="col-sm-2">{{'groups.membersPlural' | translate:{n: group.members && group.members.length || 0} }}</td> <td class="entity-actions"> <link-to route="userManagement.editGroup" class="link-to-group" id="{{group.group_name}}"> <i class="fa fa-pencil"></i> @@ -77,11 +77,11 @@ <i class="fa fa-2x fa-spinner fa-spin" aria-hidden="true"></i> </div> <div class="alert empty-table-alert col-sm-12" ng-show="!groups.length && !isLoading"> - {{'common.alerts.nothingToDisplay' | translate: '{term: constants.groups}'}} + {{'common.alerts.nothingToDisplay' | translate:{term: constants.groups} }} </div> <div class="col-sm-12 table-bar" ng-show="totalGroups > minRowsToShowPagination"> <div class="pull-left filtered-info"> - <span>{{'common.filterInfo' | translate: '{showed: tableInfo.showed, total: tableInfo.total, term: constants.groups}'}}</span> + <span>{{'common.filterInfo' | translate:{showed: tableInfo.showed, total: tableInfo.total, term: constants.groups} }}</span> <span ng-show="isNotEmptyFilter">- <a href ng-click="clearFilters()">{{'common.controls.clearFilters' | translate}}</a></span> </div> <div class="pull-right left-margin"> http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/changePassword.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/changePassword.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/changePassword.html index f29d315..2f52f08 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/changePassword.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/changePassword.html @@ -16,7 +16,7 @@ * limitations under the License. --> <div class="modal-header"> - <h3 class="modal-title">{{'users.changePasswordFor' | translate: '{userName: userName}'}}</h3> + <h3 class="modal-title">{{'users.changePasswordFor' | translate:{userName: userName} }}</h3> </div> <div class="modal-body"> <form class="form-horizontal" novalidate name="form.passwordChangeForm" role="form" > http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/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 8a96663..300046d 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 @@ -24,8 +24,8 @@ </ol> <div class="pull-right"> <div ng-switch="isCurrentUser || user.user_type != 'LOCAL'"> - <button class="btn deleteuser-btn disabled btn-default" ng-switch-when="true" tooltip="{{'common.cannotDelete' | translate: '{term: constants.user}'}}">{{'common.delete' | translate: '{term: constants.user}'}}</button> - <button class="btn deleteuser-btn btn-danger" ng-switch-when="false" ng-click="deleteUser()">{{'common.delete' | translate: '{term: constants.user}'}}</button> + <button class="btn deleteuser-btn disabled btn-default" ng-switch-when="true" tooltip="{{'common.cannotDelete' | translate:{term: constants.user} }}">{{'common.delete' | translate:{term: constants.user} }}</button> + <button class="btn deleteuser-btn btn-danger" ng-switch-when="false" ng-click="deleteUser()">{{'common.delete' | translate:{term: constants.user} }}</button> </div> </div> </div> @@ -40,7 +40,7 @@ <div class="form-group"> <label class="col-sm-2 switch-inline-label">{{'users.status' | translate}}</label> <div class="col-sm-10"> - <toggle-switch on-change="toggleUserActive()" disabled-tooltip="{{'users.alerts.cannotChange' | translate: '{term: constants.status}'}}" ng-disabled="isCurrentUser" model="user.active" class="switch-success userstatus {{user ? '' : 'no-animation'}}" data-off-color="danger"></toggle-switch> + <toggle-switch on-change="toggleUserActive()" disabled-tooltip="{{'users.alerts.cannotChange' | translate:{term: constants.status} }}" ng-disabled="isCurrentUser" model="user.active" class="switch-success userstatus {{user ? '' : 'no-animation'}}" data-off-color="danger"></toggle-switch> <span ng-if="user.active" class="switch-option-label">{{'users.active' | translate}}</span> <span ng-if="!user.active" class="switch-option-label">{{'users.inactive' | translate}}</span> </div> @@ -48,7 +48,7 @@ <div class="form-group"> <label class="col-sm-2 switch-inline-label"><span class="glyphicon glyphicon-flash"></span> {{'users.ambariAdmin' | translate}}</label> <div class="col-sm-10"> - <toggle-switch on-change="toggleUserAdmin()" disabled-tooltip="{{'users.alerts.cannotChange' | translate: '{term: constants.admin}'}}" ng-disabled="isCurrentUser" model="user.admin" class="switch-success userstatus {{user ? '' : 'no-animation'}}" data-off-color="danger"></toggle-switch> + <toggle-switch on-change="toggleUserAdmin()" disabled-tooltip="{{'users.alerts.cannotChange' | translate:{term: constants.admin} }}" ng-disabled="isCurrentUser" model="user.admin" class="switch-success userstatus {{user ? '' : 'no-animation'}}" data-off-color="danger"></toggle-switch> <span ng-if="user.admin" class="switch-option-label">{{'common.yes' | translate}}</span> <span ng-if="!user.admin" class="switch-option-label">{{'common.no' | translate}}</span> </div> @@ -57,7 +57,7 @@ <label class="col-sm-2 ">{{'users.password' | translate}}</label> <div class="col-sm-10"> <div ng-switch="user.user_type != 'LOCAL'"> - <button class="btn deleteuser-btn disabled btn-default" ng-switch-when="true" tooltip="{{'users.alerts.cannotChange' | translate: '{term: constants.password}'}}">{{'users.changePassword' | translate}}</button> + <button class="btn deleteuser-btn disabled btn-default" ng-switch-when="true" tooltip="{{'users.alerts.cannotChange' | translate:{term: constants.password} }}">{{'users.changePassword' | translate}}</button> <a href ng-click="openChangePwdDialog()" ng-switch-when="false" class="btn btn-default changepassword">{{'users.changePassword' | translate}}</a> </div> @@ -109,7 +109,7 @@ </td> </tr> <tr> - <td ng-show="noClusterPriv">{{'common.alerts.noPrivileges' | translate: '{term: constants.cluster}'}}</td> + <td ng-show="noClusterPriv">{{'common.alerts.noPrivileges' | translate:{term: constants.cluster} }}</td> </tr> </tbody> <thead class="view-permission-header"> @@ -132,11 +132,11 @@ </td> </tr> <tr> - <td ng-show="noViewPriv">{{'common.alerts.noPrivileges' | translate: '{term: constants.view}'}}</td> + <td ng-show="noViewPriv">{{'common.alerts.noPrivileges' | translate:{term: constants.view} }}</td> </tr> </tbody> </table> - <div class="alert alert-info" ng-show="hidePrivileges && !user.admin">{{'common.alerts.noPrivilegesDescription' | translate: '{term: constants.user}'}}</div> + <div class="alert alert-info" ng-show="hidePrivileges && !user.admin">{{'common.alerts.noPrivilegesDescription' | translate:{term: constants.user} }}</div> <div class="alert alert-info" ng-show="user.admin">{{'users.userIsAdmin' | translate}}</div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/usersList.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/usersList.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/usersList.html index 4a33a31..23e9ddb 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/usersList.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/usersList.html @@ -102,11 +102,11 @@ <i class="fa fa-2x fa-spinner fa-spin" aria-hidden="true"></i> </div> <div class="alert empty-table-alert col-sm-12" ng-show="!users.length && !isLoading"> - {{'common.alerts.nothingToDisplay' | translate: '{term: constants.users}'}} + {{'common.alerts.nothingToDisplay' | translate:{term: constants.users} }} </div> <div class="col-sm-12 table-bar" ng-show="totalUsers > minRowsToShowPagination"> <div class="pull-left filtered-info"> - <span>{{'common.filterInfo' | translate: '{showed: tableInfo.showed, total: tableInfo.total, term: constants.users}'}}</span> + <span>{{'common.filterInfo' | translate:{showed: tableInfo.showed, total: tableInfo.total, term: constants.users} }}</span> <span ng-show="isNotEmptyFilter">- <a href ng-click="clearFilters()">{{'common.controls.clearFilters' | translate}}</a></span> </div> <div class="pull-right left-margin"> http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/bower.json ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/bower.json b/ambari-admin/src/main/resources/ui/admin-web/bower.json index c38f464..5bbada9 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/bower.json +++ b/ambari-admin/src/main/resources/ui/admin-web/bower.json @@ -3,21 +3,24 @@ "private": true, "dependencies": { "bootstrap": "3.3.7", - "angular": "1.2.26", - "angular-route": "1.2.26", + "angular": "1.5.11", + "angular-route": "1.5.11", "angular-bootstrap": "0.11.0", "underscore": "1.7.0", "restangular": "1.4.0", "angular-bootstrap-toggle-switch": "0.5.1", - "angular-animate": "1.2.26", + "angular-animate": "1.5.11", "angular-translate": "2.2.0", "font-awesome": "4.2.0" }, "devDependencies": { - "angular-mocks": "1.2.26", + "angular-mocks": "1.5.11", "commonjs": "0.2.0", "chai": "1.8.0", "mocha": "1.14.0", "sinon": "1.10.3" + }, + "resolutions": { + "angular": "1.5.11" } } http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/package.json ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/package.json b/ambari-admin/src/main/resources/ui/admin-web/package.json index b7c514c..ab117ef 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/package.json +++ b/ambari-admin/src/main/resources/ui/admin-web/package.json @@ -14,7 +14,7 @@ "gulp-flatten": "0.0.2", "gulp-load-plugins": "0.5.0", "gulp-order": "1.1.1", - "gulp-plumber": "0.6.6", + "gulp-plumber": "1.1.0", "gulp-size": "0.3.0", "gulp-uglify": "0.2.1", "gulp-useref": "0.4.2",
