MDL-10009 ratings settings do not work in glossary

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 64e6dc3e41a8ae7772d0446c1ac3c34e03f62db4..d48d0777d5404872cabdc4797fe90510a0c9300d 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -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;
     }
 

diff --git a/mod/glossary/mod_form.php b/mod/glossary/mod_form.php
index 190cf725435d1eb7775884fd8d792e780f60554d..04ad0681bef89991a0b4a46654a779a311978994 100644 (file)
--- a/mod/glossary/mod_form.php
+++ b/mod/glossary/mod_form.php
@@ -143,7 +143,7 @@ class mod_glossary_mod_form extends moodleform_mod {
         $mform->disabledIf('assesstimefinish', 'ratingtime');
 
 //-------------------------------------------------------------------------------
-        $this->standard_coursemodule_elements();
+        $this->standard_coursemodule_elements(false);
 
 //-------------------------------------------------------------------------------
         // buttons
@@ -167,15 +167,15 @@ class mod_glossary_mod_form extends moodleform_mod {
         }
     }
 
-
-    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;
         }
     }