itizawa před 6 roky
rodič
revize
0536ccb32b

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

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

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

@@ -138,11 +138,11 @@
 
           <!-- GC-1755 Change Sentence -->
           <div class="form-group">
-            {% set configName = 'settingForm[security:PageCompleteDeletionAuthority]' %}
-            {% set configValue = getConfig('crowi','security:PageCompleteDeletionAuthority') %}
+            {% set configName = 'settingForm[security:pageCompleteDeletionAuthority]' %}
+            {% set configValue = getConfig('crowi','security:pageCompleteDeletionAuthority') %}
             <label for="{{configName}}" class="col-xs-3 control-label">Restrict Complete Deletion of Pages</label>
             <div class="col-xs-6">
-              <select class="form-control selectpicker" name="settingForm[security:PageCompleteDeletionAuthority]" value="{{ configValue }}">
+              <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=null {% if configValue == null  %}selected{% endif %}>Anyone</option>