L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-21655 big scary enrolment and roles improvements - see tacker for list of changes, includes other minor fixes too

Browse Source
This commit is contained in:
Petr Skoda
2010-03-31 07:41:31 +00:00
parent d1d4813ff2
commit 4f0c2d0009
225 changed files with 2941 additions and 3097 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assignment/db/access.php
+3 -3
View File
@@ -39,7 +39,7 @@ $capabilities = array(
'student' => CAP_ALLOW,
'teacher' => CAP_ALLOW,
'editingteacher' => CAP_ALLOW,
'admin' => CAP_ALLOW
'manager' => CAP_ALLOW
)
),
@@ -60,7 +60,7 @@ $capabilities = array(
'legacy' => array(
'teacher' => CAP_ALLOW,
'editingteacher' => CAP_ALLOW,
'admin' => CAP_ALLOW
'manager' => CAP_ALLOW
)
),
@@ -71,7 +71,7 @@ $capabilities = array(
'legacy' => array(
'teacher' => CAP_ALLOW,
'editingteacher' => CAP_ALLOW,
'admin' => CAP_ALLOW,
'manager' => CAP_ALLOW,
'student' => CAP_ALLOW,
)
),
mod/assignment/lib.php
+22 -25
View File
@@ -363,7 +363,7 @@ class assignment_base {
get_string('noattempts', 'assignment').'</a>';
}
} else {
if (!empty($USER->id)) {
if (isloggedin()) {
if ($submission = $this->get_submission($USER->id)) {
if ($submission->timemodified) {
if ($submission->timemodified <= $this->assignment->timedue || empty($this->assignment->timedue)) {
@@ -2283,7 +2283,7 @@ function assignment_cron () {
/// mail is customised for the receiver.
cron_setup_user($user, $course);
if (!has_capability('moodle/course:view', get_context_instance(CONTEXT_COURSE, $submission->course), $user->id)) {
if (!is_enrolled(get_context_instance(CONTEXT_COURSE, $submission->course), $user->id)) {
echo fullname($user)." not an active participant in " . format_string($course->shortname) . "\n";
continue;
}
@@ -3361,28 +3361,25 @@ function assignment_extend_settings_navigation(settings_navigation $settings, na
$assignmentclass = 'assignment_'.$assignmentrow->assignmenttype;
$assignmentinstance = new $assignmentclass($PAGE->cm->id, $assignmentrow, $PAGE->cm, $PAGE->course);
if (!empty($USER->id) && !has_capability('moodle/legacy:guest', $PAGE->cm->context, NULL, false)) {
$allgroups = false;
$allgroups = false;
// Add assignment submission information
if (has_capability('mod/assignment:grade', $PAGE->cm->context)) {
if ($allgroups && has_capability('moodle/site:accessallgroups', $PAGE->cm->context)) {
$group = 0;
} else {
$group = groups_get_activity_group($PAGE->cm);
}
$link = new moodle_url('/mod/assignment/submissions.php', array('id'=>$PAGE->cm->id));
if ($count = $assignmentinstance->count_real_submissions($group)) {
$string = get_string('viewsubmissions', 'assignment', $count);
} else {
$string = get_string('noattempts', 'assignment');
}
$assignmentnode->add($string, $link, navigation_node::TYPE_SETTING);
}
// Add assignment submission information
if (has_capability('mod/assignment:grade', $PAGE->cm->context)) {
if ($allgroups && has_capability('moodle/site:accessallgroups', $PAGE->cm->context)) {
$group = 0;
} else {
$group = groups_get_activity_group($PAGE->cm);
}
$link = new moodle_url('/mod/assignment/submissions.php', array('id'=>$PAGE->cm->id));
if ($count = $assignmentinstance->count_real_submissions($group)) {
$string = get_string('viewsubmissions', 'assignment', $count);
} else {
$string = get_string('noattempts', 'assignment');
}
$assignmentnode->add($string, $link, navigation_node::TYPE_SETTING);
}
if (is_object($assignmentinstance) && method_exists($assignmentinstance, 'extend_settings_navigation')) {
$assignmentinstance->extend_settings_navigation($assignmentnode);
}
}
}
if (is_object($assignmentinstance) && method_exists($assignmentinstance, 'extend_settings_navigation')) {
$assignmentinstance->extend_settings_navigation($assignmentnode);
}
}
mod/assignment/type/upload/assignment.class.php
+1 -1
View File
@@ -1072,7 +1072,7 @@ class assignment_upload extends assignment_base {
// get users submission if there is one
$submission = $this->get_submission();
if (has_capability('mod/assignment:submit', $this->cm->context)) {
if (has_capability('mod/assignment:submit', get_context_instance(COURSE_MODULE, $this->cm->id))) {
$editable = $this->isopen() && (!$submission || $this->assignment->resubmit || !$submission->timemarked);
} else {
$editable = false;
mod/assignment/type/uploadsingle/assignment.class.php
+1 -1
View File
@@ -192,7 +192,7 @@ class assignment_uploadsingle extends assignment_base {
// get users submission if there is one
$submission = $this->get_submission();
if (has_capability('mod/assignment:submit', $this->cm->context)) {
if (has_capability('mod/assignment:submit', get_context_instance(CONTEXT_MODULE, $this->cm->id))) {
$editable = $this->isopen() && (!$submission || $this->assignment->resubmit || !$submission->timemarked);
} else {
$editable = false;