Skip to content

Commit

Permalink
Fix the problem that the deletion failure of the system rights manage…
Browse files Browse the repository at this point in the history
…ment page does not prompt (#4803)

* add tech-support-qq-4.png

* Update README.md

* Enhance the user experience in the scenario of submitting duplicate keys

* Modify the key-value conflict exception prompt, adjust the code style

* fix(apollo-portal): Fix the problem that the deletion failure of the system rights management page does not prompt

* doc(CHANGES.md): Update CHANGES.md

* fix(apollo-portal): Fix toastr.warn undefined issue

---------

Co-authored-by: Jason Song <[email protected]>
klboke and nobodyiam authored Mar 17, 2023
1 parent 670cc0e commit c6dfe76
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ Apollo 2.2.0
* [[Multi-Database Support] Optimize column define case sensitivity](https://github.com/apolloconfig/apollo/pull/4776)
* [[Multi-Database Support][pg] Where clause need escape, otherwise will request postgre use lowwer case](https://github.com/apolloconfig/apollo/pull/4780)
* [Misc dependency updates](https://github.com/apolloconfig/apollo/pull/4784)
* [Fix the problem that the deletion failure of the system rights management page does not prompt](https://github.com/apolloconfig/apollo/pull/4803)

------------------
All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/13?closed=1)
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ role_module.controller('NamespaceRoleController',
.then(function (result) {

}, function (result) {
toastr.warn(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.InitNamespacePermissionError'));
toastr.warning(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.InitNamespacePermissionError'));
});

PermissionService.has_assign_user_permission($scope.pageContext.appId)
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ angular.module('systemRole', ['app.service', 'apollo.directive', 'app.util', 'to
getCreateApplicationRoleUsers();
},
function (reason) {
toastr.warn(AppUtil.errorMsg(reason), $translate.instant('SystemRole.DeleteFailed'));
toastr.warning(AppUtil.errorMsg(reason), $translate.instant('SystemRole.DeleteFailed'));
}
);
};

0 comments on commit c6dfe76

Please sign in to comment.