Commit 7f5589d2 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Merge branch 'master' into importexport_master

parents c582046a 108bfa68
......@@ -208,6 +208,9 @@ function get_admin_user_search_results($search, $offset, $limit, $sortby, $sortd
$queries[] = array('field' => 'lastname',
'type' => 'contains',
'string' => $word);
$queries[] = array('field' => 'username',
'type' => 'contains',
'string' => $word);
}
}
foreach ($fullnames as $n) {
......
......@@ -2040,7 +2040,7 @@ class View {
$userid = $USER->get('id');
require_once(get_config('libroot') . 'group.php');
if (!group_user_access($groupid)) {
throw new AccessDeniedException();
throw new AccessDeniedException(get_string('accessdenied', 'error'));
}
$from = '
FROM {view} v
......@@ -2496,6 +2496,11 @@ function objection_form() {
function objection_form_submit(Pieform $form, $values) {
global $USER, $view, $artefact;
if (!$USER->is_logged_in()) {
throw new AccessDeniedException(get_string('accessdenied', 'error'));
}
require_once('activity.php');
$data = new StdClass;
......
/* The main calendar widget. DIV containing a table. */
div.calendar { position: relative; }
div.calendar { position: static; }
.calendar table {
border: 1px solid #d2d2d2;
......
......@@ -1636,7 +1636,6 @@ button#dosearch {
}
#editaccess_overrides_container {
clear: both;
float: left;
}
#editaccess_overrides_container fieldset {
padding: 10px;
......
......@@ -69,6 +69,7 @@ if ($submittedgroup && group_user_can_assess_submitted_views($submittedgroup, $U
'method' => 'post',
'plugintype' => 'core',
'pluginname' => 'view',
'autofocus' => false,
'elements' => array(
'submittedview' => array(
'type' => 'html',
......
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