mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
MDL-11672, hide hidden assignment descriptions from calendar
This commit is contained in:
parent
5779b901e8
commit
dc6cb74efd
3 changed files with 52 additions and 1 deletions
|
@ -419,12 +419,37 @@ function calendar_get_upcoming($courses, $groups, $users, $daysinfuture, $maxeve
|
|||
if($events !== false) {
|
||||
|
||||
foreach($events as $event) {
|
||||
|
||||
if(!empty($event->modulename)) {
|
||||
$mod = get_coursemodule_from_instance($event->modulename, $event->instance);
|
||||
if (!groups_course_module_visible($mod)) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ($event->modulename == 'assignment'){
|
||||
if(!calendar_edit_event_allowed($event)){ // cannot manage entries, eg. student
|
||||
if(!$assignment = get_record('assignment','id',$event->instance)){
|
||||
// error("assignment ID was incorrect");
|
||||
continue;
|
||||
}
|
||||
// assign assignment to assignment object to use hidden_is_hidden method
|
||||
require_once($CFG->dirroot.'/mod/assignment/lib.php');
|
||||
|
||||
if (!file_exists($CFG->dirroot.'/mod/assignment/type/'.$assignment->assignmenttype.'/assignment.class.php')) {
|
||||
continue;
|
||||
}
|
||||
require_once ($CFG->dirroot.'/mod/assignment/type/'.$assignment->assignmenttype.'/assignment.class.php');
|
||||
|
||||
$assignmentclass = 'assignment_'.$assignment->assignmenttype;
|
||||
$assignmentinstance = new $assignmentclass($mod->id,$assignment);
|
||||
|
||||
if ($assignmentinstance->description_is_hidden()){//force not to show description before availability
|
||||
$event->description = get_string('notavailableyet', 'assignment');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if($processed >= $display->maxevents) {
|
||||
break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue