Browse Source

fix isAllGroupMembershipRequiredForPageCompleteDeletion configuration

Futa Arai 2 years ago
parent
commit
f8afd82ef5

+ 2 - 1
apps/app/public/static/locales/en_US/translation.json

@@ -327,7 +327,8 @@
     "already_exists": "Page with the path already exists.",
     "already_exists": "Page with the path already exists.",
     "outdated": "Page is updated someone and now outdated.",
     "outdated": "Page is updated someone and now outdated.",
     "user_not_admin": "Only admin user can delete",
     "user_not_admin": "Only admin user can delete",
-    "single_deletion_empty_pages": "Empty pages cannot be single deleted"
+    "single_deletion_empty_pages": "Empty pages cannot be single deleted",
+    "complete_deletion_not_allowed_for_user": "You are not allowed to delete this page completely"
   },
   },
   "page_history": {
   "page_history": {
     "revision_list": "Revision list",
     "revision_list": "Revision list",

+ 2 - 1
apps/app/public/static/locales/ja_JP/translation.json

@@ -360,7 +360,8 @@
     "already_exists": "そのパスを持つページは既に存在しています。",
     "already_exists": "そのパスを持つページは既に存在しています。",
     "outdated": "ページが他のユーザーによって更新されました。",
     "outdated": "ページが他のユーザーによって更新されました。",
     "user_not_admin": "権限のあるユーザーのみが削除できます",
     "user_not_admin": "権限のあるユーザーのみが削除できます",
-    "single_deletion_empty_pages": "空ページの単体削除はできません"
+    "single_deletion_empty_pages": "空ページの単体削除はできません",
+    "complete_deletion_not_allowed_for_user": "ページを完全に削除する権限がありません"
   },
   },
   "page_history": {
   "page_history": {
     "revision_list": "更新履歴",
     "revision_list": "更新履歴",

+ 2 - 1
apps/app/public/static/locales/zh_CN/translation.json

@@ -317,7 +317,8 @@
 		"already_exists": "具有该路径的页面已存在",
 		"already_exists": "具有该路径的页面已存在",
 		"outdated": "页面已被某人更新,现在已过时。",
 		"outdated": "页面已被某人更新,现在已过时。",
 		"user_not_admin": "仅管理员用户可以删除",
 		"user_not_admin": "仅管理员用户可以删除",
-    "single_deletion_empty_pages": "空的页面不能被单一删除"
+    "single_deletion_empty_pages": "空的页面不能被单一删除",
+    "complete_deletion_not_allowed_for_user": "您无权永久删除该页面"
   },
   },
   "page_history": {
   "page_history": {
     "revision_list": "修订清单",
     "revision_list": "修订清单",

+ 1 - 1
apps/app/src/components/Admin/Security/SecuritySetting.jsx

@@ -273,7 +273,7 @@ class SecuritySetting extends React.Component {
                         id="isAllGroupMembershipRequiredForPageCompleteDeletionCheckbox"
                         id="isAllGroupMembershipRequiredForPageCompleteDeletionCheckbox"
                         className="form-check-input"
                         className="form-check-input"
                         type="checkbox"
                         type="checkbox"
-                        checked={!adminGeneralSecurityContainer.state.isAllGroupMembershipRequiredForPageCompleteDeletion}
+                        checked={adminGeneralSecurityContainer.state.isAllGroupMembershipRequiredForPageCompleteDeletion}
                         onChange={() => { adminGeneralSecurityContainer.switchIsAllGroupMembershipRequiredForPageCompleteDeletion() }}
                         onChange={() => { adminGeneralSecurityContainer.switchIsAllGroupMembershipRequiredForPageCompleteDeletion() }}
                       />
                       />
                       <label className="form-check-label" htmlFor="isAllGroupMembershipRequiredForPageCompleteDeletionCheckbox">
                       <label className="form-check-label" htmlFor="isAllGroupMembershipRequiredForPageCompleteDeletionCheckbox">

+ 4 - 0
apps/app/src/components/PageManagement/ApiErrorMessage.jsx

@@ -30,6 +30,10 @@ const ApiErrorMessage = (props) => {
         return (
         return (
           <strong><i className="icon-fw icon-ban"></i>{ t('page_api_error.user_not_admin') }</strong>
           <strong><i className="icon-fw icon-ban"></i>{ t('page_api_error.user_not_admin') }</strong>
         );
         );
+      case 'complete_deletion_not_allowed_for_user':
+        return (
+          <strong><i className="icon-fw icon-ban"></i>{ t('page_api_error.complete_deletion_not_allowed_for_user') }</strong>
+        );
       case 'outdated':
       case 'outdated':
         return (
         return (
           <>
           <>

+ 1 - 1
apps/app/src/server/routes/page.js

@@ -755,7 +755,7 @@ module.exports = function(crowi, app) {
       if (isCompletely) {
       if (isCompletely) {
         const canDeleteCompletely = await crowi.pageService.canDeleteCompletely(page, req.user, isRecursively);
         const canDeleteCompletely = await crowi.pageService.canDeleteCompletely(page, req.user, isRecursively);
         if (!canDeleteCompletely) {
         if (!canDeleteCompletely) {
-          return res.json(ApiResponse.error('You cannot delete this page completely', 'user_not_admin'));
+          return res.json(ApiResponse.error('You cannot delete this page completely', 'complete_deletion_not_allowed_for_user'));
         }
         }
 
 
         if (pagePathUtils.isUsersHomepage(page.path)) {
         if (pagePathUtils.isUsersHomepage(page.path)) {