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

MDL-10009 ratings settings do not work in glossary; backport from HEAD

Browse Source
This commit is contained in:
skodak
2007-06-02 14:06:59 +00:00
parent 2e83e24b6d
commit ed0d8418ae
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/glossary/lib.php
+12 -8
View File
@@ -52,7 +52,7 @@ function glossary_add_instance($glossary) {
/// will create a new instance and return the id number
/// of the new instance.
if (!isset($glossary->userating) || !$glossary->userating) {
if (empty($glossary->userating)) {
$glossary->assessed = 0;
}
@@ -61,9 +61,11 @@ function glossary_add_instance($glossary) {
$glossary->assesstimefinish = 0;
}
if ( !isset($glossary->globalglossary) ) {
if (empty($glossary->globalglossary) ) {
$glossary->globalglossary = 0;
} elseif (!has_capability('mod/glossary:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
}
if (!has_capability('mod/glossary:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
$glossary->globalglossary = 0;
}
@@ -86,17 +88,19 @@ function glossary_update_instance($glossary) {
/// will update an existing instance with new data.
global $CFG;
if (!has_capability('mod/glossary:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
unset($glossary->globalglossary);
}
if (empty($glossary->globalglossary)) {
$glossary->globalglossary = 0;
}
if (!has_capability('mod/glossary:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
// keep previous
unset($glossary->globalglossary);
}
$glossary->timemodified = time();
$glossary->id = $glossary->instance;
if (!isset($glossary->userating) || !$glossary->userating) {
if (empty($glossary->userating)) {
$glossary->assessed = 0;
}
@@ -1476,7 +1480,7 @@ function glossary_print_comment($course, $cm, $glossary, $entry, $comment) {
echo '<div class="boxaligncenter">';
echo '<table class="glossarycomment" cellspacing="0">';
echo '<tr valign="top">';
echo '<tr><td class="left picture">';
echo '<td class="left picture">';
print_user_picture($user->id, $course->id, $user->picture);
echo '</td>';
echo '<td class="entryheader">';
mod/glossary/mod_form.php
+12 -12
View File
@@ -165,19 +165,19 @@ class mod_glossary_mod_form extends moodleform_mod {
$mainglossaryel->setPersistantFreeze(false);
}
}
function data_preprocessing($default_values){
if (isset($default_values['assessed'])){
$default_values['userating']=($default_values['assessed'])?true:false;
}
if (isset($default_values['assessed'])){
$default_values['ratingtime']=($default_values['assessed']
&& $default_values['assesstimestart']
&& $default_values['assesstimefinish'] )?1:0;
}
}
function data_preprocessing(&$default_values){
if (empty($default_values['assessed'])){
$default_values['userating'] = 0;
$default_values['ratingtime'] = 0;
} else {
$default_values['userating'] = 1;
$default_values['ratingtime']=
($default_values['assesstimestart'] && $default_values['assesstimefinish']) ? 1 : 0;
}
}
}
?>