itizawa пре 6 година
родитељ
комит
7cbf8851a6
3 измењених фајлова са 3 додато и 3 уклоњено
  1. 1 1
      src/server/models/config.js
  2. 1 1
      src/server/models/user.js
  3. 1 1
      src/server/views/admin/security.html

+ 1 - 1
src/server/models/config.js

@@ -64,7 +64,7 @@ module.exports = function(crowi) {
 
       'security:list-policy:hideRestrictedByOwner' : false,
       'security:list-policy:hideRestrictedByGroup' : false,
-      'security:pageCompleteDeletionAuthority' : 'adminOnly',
+      'security:pageCompleteDeletionAuthority' : null,
 
       'security:isEnabledPassport' : false,
       'security:passport-ldap:isEnabled' : false,

+ 1 - 1
src/server/models/user.js

@@ -201,7 +201,7 @@ module.exports = function(crowi) {
 
   userSchema.methods.canDeleteCompletely = function(creatorId) {
     const pageCompleteDeletionAuthority = crowi.configManager.getConfig('crowi', 'security:PageCompleteDeletionAuthority');
-    if (pageCompleteDeletionAuthority === 'anyone' || this.admin) {
+    if (!pageCompleteDeletionAuthority || this.admin) {
       return true;
     }
     if (pageCompleteDeletionAuthority === 'adminAndAuthor') {

+ 1 - 1
src/server/views/admin/security.html

@@ -145,7 +145,7 @@
               <select class="form-control selectpicker" name="settingForm[security:PageCompleteDeletionAuthority]" value="{{ configValue }}">
                 <option value="adminOnly" {% if configValue =="adiminOnly" %}selected{% endif %}>AdminOnly</option>
                 <option value="adminAndAuthor" {% if configValue == "adminAndAuthor" %}selected{% endif %}>AdminAndAuthor</option>
-                <option value="anyone" {% if configValue == "anyone"  %}selected{% endif %}>Anyone</option>
+                <option value=null {% if configValue == null  %}selected{% endif %}>Anyone</option>
               </select>
 
               <p class="help-block small">