rating MDL-21657 changing from ratings (plural) to rating (singular)

TheVirtualLtd · Mar 16, 2010 · 6c5fcef · 6c5fcef
1 parent ba0c89c
commit 6c5fcef
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 15 deletions.
diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php
@@ -342,7 +342,7 @@ function standard_coursemodule_elements(){
             }
         }
 
-        if (plugin_supports('mod', $this->_modname, FEATURE_RATINGS, false)) {
+        if (plugin_supports('mod', $this->_modname, FEATURE_RATE, false)) {
             $mform->addElement('header', 'modstandardratings', get_string('ratings', 'ratings'));
 
             //$mform->addElement('checkbox', 'assessed', get_string('allowratings', 'ratings') , get_string('ratingsuse', 'ratings'));

diff --git a/lang/en_utf8/rating.php b/lang/en_utf8/rating.php
@@ -1,4 +1,5 @@
 <?php
+$string['rate'] = 'Rate';
 $string['rating'] = 'Rating';
 $string['ratings'] = 'Ratings';
 $string['aggregatetype'] = 'Aggregate type';

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -364,7 +364,7 @@
 
 define('FEATURE_COMMENT', 'comment');
 
-define('FEATURE_RATINGS', 'ratings');
+define('FEATURE_RATE', 'rate');
 
 /** Unspecified module archetype */
 define('MOD_ARCHETYPE_OTHER', 0);

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
@@ -1244,7 +1244,7 @@ function render_rating(rating $rating) {
         }
 
         if (empty($strrate)) {
-            $strrate = get_string("rate", "forum");
+            $strrate = get_string("rate", "rating");
         }
 
         $strratings = '';
@@ -1313,13 +1313,16 @@ function render_rating(rating $rating) {
 
             //generate an array of values for numeric scales
             $scalearray = $rating->settings->scale->scaleitems;
-            if( !is_array($scalearray) && is_int($scalearray) ) {
-                $scalearray = array();
-                for($i=0; $i<=$rating->settings->scale->scaleitems; $i++) {
-                    $scalearray[$i] = $i;
+            if( !is_array($scalearray) ) { //almost certainly a numerical scale
+                $intscalearray = intval($scalearray);//just in case theyve passed "5" instead of 5
+                if( is_int($intscalearray) && $intscalearray>0 ){
+                    $scalearray = array();
+                    for($i=0; $i<=$rating->settings->scale->scaleitems; $i++) {
+                        $scalearray[$i] = $i;
+                    }
                 }
             }
-            
+
             $scalearray = array(RATING_UNSET_RATING => $strrate.'...') + $scalearray;
             $strratings .= html_writer::select($scalearray, 'rating'.$rating->itemid, $rating->rating, false, array('class'=>'postratingmenu ratinginput'));
 

diff --git a/mod/data/lib.php b/mod/data/lib.php
@@ -2579,7 +2579,7 @@ function data_supports($feature) {
         case FEATURE_GRADE_HAS_GRADE:         return true;
         case FEATURE_GRADE_OUTCOMES:          return true;
         case FEATURE_MOD_SUBPLUGINS:          return array('datafield'=>'mod/data/field', 'datapreset'=>'mod/data/preset');
-        case FEATURE_RATINGS:                 return true;
+        case FEATURE_RATE:                 return true;
 
         default: return null;
     }

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
@@ -276,7 +276,7 @@ function forum_supports($feature) {
         case FEATURE_COMPLETION_HAS_RULES:    return true;
         case FEATURE_GRADE_HAS_GRADE:         return true;
         case FEATURE_GRADE_OUTCOMES:          return true;
-        case FEATURE_RATINGS:                 return true;
+        case FEATURE_RATE:                 return true;
 
         default: return null;
     }

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
@@ -2667,7 +2667,7 @@ function glossary_supports($feature) {
         case FEATURE_COMPLETION_TRACKS_VIEWS: return true;
         case FEATURE_GRADE_HAS_GRADE:         return true;
         case FEATURE_GRADE_OUTCOMES:          return true;
-        case FEATURE_RATINGS:                 return true;
+        case FEATURE_RATE:                 return true;
 
         default: return null;
     }

diff --git a/rating/index.php b/rating/index.php
@@ -45,10 +45,10 @@
 
 $permissions = rating::get_rating_permissions(context);
 if (!$permissions[RATING_VIEW]) {
-    print_error('noviewrate', 'ratings');
+    print_error('noviewrate', 'rating');
 }
 if (!$permissions[RATING_VIEW_ALL] and $USER->id != $item->userid) {
-    print_error('noviewanyrate', 'ratings');
+    print_error('noviewanyrate', 'rating');
 }
 
 switch ($sort) {
@@ -59,8 +59,8 @@
 
 $scalemenu = make_grades_menu($scaleid);
 
-$strratings = get_string('ratings', 'ratings');
-$strrating  = get_string('rating', 'ratings');
+$strratings = get_string('ratings', 'rating');
+$strrating  = get_string('rating', 'rating');
 $strname    = get_string('name');
 $strtime    = get_string('time');