Merge branch 'master' into fix

apolloconfig · Mar 17, 2023 · 15322aa · 15322aa
2 parents 1e9aed4 + c6dfe76
commit 15322aa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -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)
 * [Fix the issue of the system permission management page retrieving non-existent users](https://github.com/apolloconfig/apollo/pull/4802)
 
 ------------------

diff --git a/apollo-portal/src/main/resources/static/scripts/controller/role/NamespaceRoleController.js b/apollo-portal/src/main/resources/static/scripts/controller/role/NamespaceRoleController.js
@@ -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)

diff --git a/apollo-portal/src/main/resources/static/scripts/controller/role/SystemRoleController.js b/apollo-portal/src/main/resources/static/scripts/controller/role/SystemRoleController.js
@@ -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'));
                             }
                         );
                 };