Bug 1795097: Move some "basic" view settings to "advanced" section

behatnotneeded

Change-Id: I7a49a5425451d96562ade492e7f2a61ba0e712e1
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 20d715bb)

htdocs/view/editlayout.php

@@ -276,12 +276,6 @@ function get_basic_elements() {
             'defaultvalue' => $view->get('description'),
             'rules'        => array('maxlength' => 65536),
         ),
-        'lockblocks' => array(
-            'type'         => 'switchbox',
-            'title'        => get_string('lockblocks', 'view'),
-            'description'  => get_string('lockblocksdescription', 'view'),
-            'defaultvalue' => $view->get('lockblocks'),
-        ),
         'tags'        => array(
             'type'         => 'tags',
             'title'        => get_string('tags'),
@@ -305,26 +299,6 @@ function get_basic_elements() {
             'help'         => true,
         );
     }
-    if ($group) {
-        $grouproles = $USER->get('grouproles');
-        if ($grouproles[$group] == 'admin') {
-            $elements['locked'] = array(
-                'type'         => 'switchbox',
-                'title'        => get_string('Locked', 'view'),
-                'description'  => get_string('lockedgroupviewdesc', 'view'),
-                'defaultvalue' => $view->get('locked'),
-                'disabled'     => $view->get('type') == 'grouphomepage', // This page unreachable for grouphomepage anyway
-            );
-        }
-    }
-    if (get_config('allowanonymouspages')) {
-        $elements['anonymise'] = array(
-            'type'         => 'switchbox',
-            'title'        => get_string('anonymise','view'),
-            'description'  => get_string('anonymisedescription','view'),
-            'defaultvalue' => $view->get('anonymise'),
-        );
-    }
     return $elements;
 }
 
@@ -366,6 +340,12 @@ function get_advanced_elements() {
             'rules'        => array('maxlength' => 100, 'regex' => get_config('cleanurlvalidate')),
             'ignore'       => !$urlallowed,
         ),
+        'lockblocks' => array(
+            'type'         => 'switchbox',
+            'title'        => get_string('lockblocks', 'view'),
+            'description'  => get_string('lockblocksdescription', 'view'),
+            'defaultvalue' => $view->get('lockblocks'),
+        ),
     );
     if (!($group || $institution)) {
         $default = $view->get('ownerformat');
@@ -381,6 +361,26 @@ function get_advanced_elements() {
             'rules'        => array('required' => true),
         );
     }
+    if ($group) {
+        $grouproles = $USER->get('grouproles');
+        if ($grouproles[$group] == 'admin') {
+            $elements['locked'] = array(
+                'type'         => 'switchbox',
+                'title'        => get_string('Locked', 'view'),
+                'description'  => get_string('lockedgroupviewdesc', 'view'),
+                'defaultvalue' => $view->get('locked'),
+                'disabled'     => $view->get('type') == 'grouphomepage', // This page unreachable for grouphomepage anyway
+            );
+        }
+    }
+    if (get_config('allowanonymouspages')) {
+        $elements['anonymise'] = array(
+            'type'         => 'switchbox',
+            'title'        => get_string('anonymise','view'),
+            'description'  => get_string('anonymisedescription','view'),
+            'defaultvalue' => $view->get('anonymise'),
+        );
+    }
     return $elements;
 }