Commit 85b8443b authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic Committed by Gerrit Code Review
Browse files

Merge "Bug 1795097: placing 'locked' above 'locked blocks'"

parents 5c860d15 0dc60d48
...@@ -340,12 +340,24 @@ function get_advanced_elements() { ...@@ -340,12 +340,24 @@ function get_advanced_elements() {
'rules' => array('maxlength' => 100, 'regex' => get_config('cleanurlvalidate')), 'rules' => array('maxlength' => 100, 'regex' => get_config('cleanurlvalidate')),
'ignore' => !$urlallowed, 'ignore' => !$urlallowed,
), ),
'lockblocks' => array( );
'type' => 'switchbox', if ($group) {
'title' => get_string('lockblocks', 'view'), $grouproles = $USER->get('grouproles');
'description' => get_string('lockblocksdescription', 'view'), if ($grouproles[$group] == 'admin') {
'defaultvalue' => $view->get('lockblocks'), $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
);
}
}
$elements['lockblocks'] = array(
'type' => 'switchbox',
'title' => get_string('lockblocks', 'view'),
'description' => get_string('lockblocksdescription', 'view'),
'defaultvalue' => $view->get('lockblocks'),
); );
if (!($group || $institution)) { if (!($group || $institution)) {
$default = $view->get('ownerformat'); $default = $view->get('ownerformat');
...@@ -361,18 +373,6 @@ function get_advanced_elements() { ...@@ -361,18 +373,6 @@ function get_advanced_elements() {
'rules' => array('required' => true), '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')) { if (get_config('allowanonymouspages')) {
$elements['anonymise'] = array( $elements['anonymise'] = array(
'type' => 'switchbox', 'type' => 'switchbox',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment