fixes Systemeigenschaften eines Raumes sind unveränderbar #2707

Closes #2707

Merge request studip/studip!1831

2 files changed, 14 insertions, 22 deletions

diff --git a/app/controllers/resources/property.php b/app/controllers/resources/property.php
index 6c2bff4..e5c18ea 100644
--- a/app/controllers/resources/property.php
+++ b/app/controllers/resources/property.php
@@ -157,32 +157,27 @@ class Resources_PropertyController extends AuthenticatedController
                     );
                     return;
                 }
-                if (!in_array($this->write_permission_level, ['user', 'autor', 'tutor', 'admin', 'admin-global'])) {
-                    PageLayout::postError(
-                        _('Die angegebene Rechtestufe ist ungültig!')
-                    );
-                    return;
-                }
+            }
+
+            if (!in_array($this->write_permission_level, ['user', 'autor', 'tutor', 'admin', 'admin-global'])) {
+                PageLayout::postError(
+                    _('Die angegebene Rechtestufe ist ungültig!')
+                );
+                return;
             }
 
             $this->property->description = $this->description;
             $this->property->display_name = $this->display_name;
+            $this->property->write_permission_level = $this->write_permission_level;
+            $this->property->searchable = $this->searchable ? '1' : '0';
             $this->property->info_label = $this->info_label ? '1' : '0';
+            $this->property->range_search = $this->range_search ? '1' : '0';
 
             if (!$this->property->system) {
                 //The following fields may only be edited
                 //if the property is not a system property:
                 $this->property->name = $this->name;
                 $this->property->type = $this->type;
-                $this->property->searchable = ($this->searchable ? '1' : '0');
-                $this->property->options = $this->options;
-                $this->property->range_search = (
-                    $this->range_search
-                    ? '1'
-                    : '0'
-                );
-                $this->property->write_permission_level = $this->write_permission_level;
-
             }
 
             $success = $this->property->store();
diff --git a/app/views/resources/property/_add_edit_form.php b/app/views/resources/property/_add_edit_form.php
index 75f3ddc..8070fd4 100644
--- a/app/views/resources/property/_add_edit_form.php
+++ b/app/views/resources/property/_add_edit_form.php
@@ -23,8 +23,7 @@
 </label>
 <label>
     <?= _('Minimale Rechtestufe für Änderungen') ?>
-    <select name="write_permission_level" class="size-l"
-        <?= $property->system ? 'disabled="disabled"' : '' ?>>
+    <select name="write_permission_level" class="size-l">
         <? foreach(['user', 'autor', 'tutor', 'admin'] as $level) : ?>
             <option value="<?= $level?>"
                 <?= $write_permission_level === $level ? 'selected="selected"' : '' ?>>
@@ -40,7 +39,7 @@
 <label>
     <?= _('Mögliche Werte') ?>
     <input type="text" name="options" value="<?= htmlReady($options) ?>"
-        <?= $property->system && !$GLOBALS['perm']->have_perm('root') ? 'readonly="readonly"' : '' ?>>
+        <?= !$GLOBALS['perm']->have_perm('root') ? 'disabled="disabled"' : '' ?>>
 </label>
 <label>
     <?= _('Angezeigter Name') ?>
@@ -48,8 +47,7 @@
 </label>
 <label>
     <input type="checkbox" name="searchable"
-        <?= $searchable ? 'checked="checked"' : '' ?>
-        <?= $property->system ? 'disabled="disabled"' : '' ?>>
+        <?= $searchable ? 'checked="checked"' : '' ?>>
     <?= _('Diese Eigenschaft kann zur Suche genutzt werden.') ?>
 </label>
 <label>
@@ -59,7 +57,6 @@
 </label>
 <label>
     <input type="checkbox" name="range_search" value="1"
-        <?= $range_search ? 'checked="checked"' : '' ?>
-        <?= $property->system ? 'disabled="disabled"' : '' ?>>
+        <?= $range_search ? 'checked="checked"' : '' ?>>
     <?= _('Suchkriterium mit Intervall') ?>
 </label>