moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-10132 improved random glossary blocks - now uses modinfo too + fixed some notices; merged from MOODLE_19_STABLE

Browse source
This commit is contained in:
skodak 2008-02-05 23:34:20 +00:00
parent d6bc2a8104
commit 51edc06ea1
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
blocks/glossary_random/block_glossary_random.php
View file

@ -153,7 +153,7 @@ class block_glossary_random extends block_base {
} }
function get_content() { function get_content() {
global $USER, $CFG; global $USER, $CFG, $COURSE;
if (empty($this->config->glossary)) { if (empty($this->config->glossary)) {
$this->content->text = get_string('notyetconfigured','block_glossary_random'); $this->content->text = get_string('notyetconfigured','block_glossary_random');
@ -163,7 +163,16 @@ class block_glossary_random extends block_base {
$glossaryid = $this->config->glossary; $glossaryid = $this->config->glossary;
if(! $glossary = get_record('glossary', 'id', $glossaryid, 'course', $this->course->id) ){ if ($this->course->id == $COURSE->id) {
$course = $COURSE;
} else {
$course = get_record('course', 'id', $this->course->id);
}
require_once($CFG->dirroot.'/course/lib.php');
$modinfo = get_fast_modinfo($course);
if (!isset($modinfo->instances['glossary'][$glossaryid])) {
// we can get here if the glossary has been deleted, so // we can get here if the glossary has been deleted, so
// unconfigure the glossary from the block.. // unconfigure the glossary from the block..
$this->config->glossary = 0; $this->config->glossary = 0;
@ -175,6 +184,7 @@ class block_glossary_random extends block_base {
return $this->content; return $this->content;
} }
$cm = $modinfo->instances['glossary'][$glossaryid];
if (empty($this->config->cache)) { if (empty($this->config->cache)) {
$this->config->cache = ''; $this->config->cache = '';
@ -189,10 +199,8 @@ class block_glossary_random extends block_base {
// place link to glossary in the footer if the glossary is visible // place link to glossary in the footer if the glossary is visible
$cm = get_coursemodule_from_instance('glossary',$glossaryid, $this->course->id) ;
//Obtain the visible property from the instance //Obtain the visible property from the instance
if (coursemodule_visible_for_user($cm)) { if ($cm->uservisible) {
if (has_capability('mod/glossary:write', get_context_instance(CONTEXT_MODULE, $cm->id))) { if (has_capability('mod/glossary:write', get_context_instance(CONTEXT_MODULE, $cm->id))) {
$this->content->footer = '<a href="'.$CFG->wwwroot.'/mod/glossary/edit.php?id='.$cm->id $this->content->footer = '<a href="'.$CFG->wwwroot.'/mod/glossary/edit.php?id='.$cm->id
.'" title="'.$this->config->addentry.'">'.$this->config->addentry.'</a><br />'; .'" title="'.$this->config->addentry.'">'.$this->config->addentry.'</a><br />';