ratings MDL-21657 Improving capabilities for ratings.

Rather than performing complicated upgrade procedures from the old (broken) logic in three activity modules, we are adding new capabilities to those three modules to make them all consistent, and using them in a callback from the Ratings API.  This is the same as the Comments API.

The downside is that two sets of capabilities need to be enabled for ratings to work.  Hopefully this can be mitigated somewhat when build some sort of shortcuts on the module settings forms to set capabilities.  In the meantime, the effect is reduced somewhat by having all the rating capabilities enabled by default for student and teacher roles.  This means control is in the hands of whatever the modules have set, giving very close backward compatibility.

This is not the perfect solution, but neither were the other two.

diff --git a/lib/db/access.php b/lib/db/access.php
index 93cd4b0..a79ccfb 100644 (file)
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -1473,12 +1473,23 @@ $capabilities = array(
             'manager' => CAP_ALLOW
         )
     ),
+    'moodle/rating:viewany' => array(
+        'riskbitmask' => RISK_PERSONAL,
+        'captype' => 'read',
+        'contextlevel' => CONTEXT_SYSTEM,
+        'legacy' => array(
+            'student' => CAP_ALLOW,
+            'teacher' => CAP_ALLOW,
+            'editingteacher' => CAP_ALLOW,
+            'manager' => CAP_ALLOW
+        )
+    ),
     'moodle/rating:viewall' => array(
-
         'riskbitmask' => RISK_PERSONAL,
         'captype' => 'read',
         'contextlevel' => CONTEXT_SYSTEM,
         'legacy' => array(
+            'student' => CAP_ALLOW,
             'teacher' => CAP_ALLOW,
             'editingteacher' => CAP_ALLOW,
             'manager' => CAP_ALLOW
@@ -1488,6 +1499,7 @@ $capabilities = array(
         'captype' => 'write',
         'contextlevel' => CONTEXT_SYSTEM,
         'legacy' => array(
+            'student' => CAP_ALLOW,
             'teacher' => CAP_ALLOW,
             'editingteacher' => CAP_ALLOW,
             'manager' => CAP_ALLOW

diff --git a/mod/data/db/access.php b/mod/data/db/access.php
index c51afdc..9660d05 100644 (file)
--- a/mod/data/db/access.php
+++ b/mod/data/db/access.php
@@ -72,6 +72,17 @@ $capabilities = array(
         )
     ),
 
+    'mod/data:rate' => array(
+
+        'captype' => 'write',
+        'contextlevel' => CONTEXT_MODULE,
+        'legacy' => array(
+            'teacher' => CAP_ALLOW,
+            'editingteacher' => CAP_ALLOW,
+            'manager' => CAP_ALLOW
+        )
+    ),
+
     'mod/data:viewrating' => array(
 
         'captype' => 'read',
@@ -83,15 +94,30 @@ $capabilities = array(
         )
     ),
 
-    'mod/data:rate' => array(
+    'mod/data:viewanyrating' => array(
 
-        'captype' => 'write',
+        'riskbitmask' => RISK_PERSONAL,
+        'captype' => 'read',
         'contextlevel' => CONTEXT_MODULE,
         'legacy' => array(
             'teacher' => CAP_ALLOW,
             'editingteacher' => CAP_ALLOW,
             'manager' => CAP_ALLOW
-        )
+        ),
+        'clonepermissionsfrom' =>  'mod/data:viewrating'
+    ),
+
+    'mod/data:viewallratings' => array(
+
+        'riskbitmask' => RISK_PERSONAL,
+        'captype' => 'read',
+        'contextlevel' => CONTEXT_MODULE,
+        'legacy' => array(
+            'teacher' => CAP_ALLOW,
+            'editingteacher' => CAP_ALLOW,
+            'manager' => CAP_ALLOW
+        ),
+        'clonepermissionsfrom' =>  'mod/data:viewrating'
     ),
 
     'mod/data:approve' => array(

diff --git a/mod/data/lang/en/data.php b/mod/data/lang/en/data.php
index bddd24c..c1fe655 100755 (executable)
--- a/mod/data/lang/en/data.php
+++ b/mod/data/lang/en/data.php
@@ -88,8 +88,10 @@ $string['data:manageuserpresets'] = 'Manage all template presets';
 $string['data:rate'] = 'Rate entries';
 $string['data:readentry'] = 'Read entries';
 $string['data:viewalluserpresets'] = 'View presets from all users';
+$string['data:viewallratings'] = 'View all raw ratings given by individuals';
+$string['data:viewanyrating'] = 'View total ratings that anyone received';
 $string['data:viewentry'] = 'View entries';
-$string['data:viewrating'] = 'View ratings';
+$string['data:viewrating'] = 'View the total rating you received';
 $string['data:writeentry'] = 'Write entries';
 $string['date'] = 'Date';
 $string['dateentered'] = 'Date entered';

diff --git a/mod/data/version.php b/mod/data/version.php
index 308993f..8132fa7 100644 (file)
--- a/mod/data/version.php
+++ b/mod/data/version.php
@@ -5,8 +5,8 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2010041300;
-$module->requires = 2010041300;  // Requires this Moodle version
+$module->version  = 2010042300;
+$module->requires = 2010042300;  // Requires this Moodle version
 $module->cron     = 60;
 
 

diff --git a/mod/forum/db/access.php b/mod/forum/db/access.php
index 01cfd85..8eea3d9 100644 (file)
--- a/mod/forum/db/access.php
+++ b/mod/forum/db/access.php
@@ -142,6 +142,7 @@ $capabilities = array(
 
     'mod/forum:viewanyrating' => array(
 
+        'riskbitmask' => RISK_PERSONAL,
         'captype' => 'read',
         'contextlevel' => CONTEXT_MODULE,
         'legacy' => array(
@@ -151,6 +152,19 @@ $capabilities = array(
         )
     ),
 
+    'mod/forum:viewallratings' => array(
+
+        'riskbitmask' => RISK_PERSONAL,
+        'captype' => 'read',
+        'contextlevel' => CONTEXT_MODULE,
+        'legacy' => array(
+            'teacher' => CAP_ALLOW,
+            'editingteacher' => CAP_ALLOW,
+            'manager' => CAP_ALLOW
+        ),
+        'clonepermissionsfrom' =>  'mod/forum:viewanyrating'
+    ),
+
     'mod/forum:rate' => array(
 
         'captype' => 'write',

diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php
index 022a6a3..c67c5bc 100644 (file)
--- a/mod/forum/lang/en/forum.php
+++ b/mod/forum/lang/en/forum.php
@@ -189,11 +189,12 @@ $string['forum:throttlingapplies'] = 'Throttling applies';
 $string['forumtracked'] = 'Unread posts are being tracked';
 $string['forumtrackednot'] = 'Unread posts are not being tracked';
 $string['forumtype'] = 'Forum type';
-$string['forum:viewanyrating'] = 'View any ratings';
+$string['forum:viewallratings'] = 'View all raw ratings given by individuals';
+$string['forum:viewanyrating'] = 'View total ratings that anyone received';
 $string['forum:viewdiscussion'] = 'View discussions';
 $string['forum:viewhiddentimedposts'] = 'View hidden timed posts';
 $string['forum:viewqandawithoutposting'] = 'Always see Q and A posts';
-$string['forum:viewrating'] = 'View ratings';
+$string['forum:viewrating'] = 'View the total rating you received';
 $string['forum:viewsubscribers'] = 'View subscribers';
 $string['generalforum'] = 'Standard forum for general use';
 $string['generalforums'] = 'General forums';

diff --git a/mod/forum/version.php b/mod/forum/version.php
index 269fa16..91eee12 100644 (file)
--- a/mod/forum/version.php
+++ b/mod/forum/version.php
@@ -24,8 +24,8 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$module->version  = 2010042200;
-$module->requires = 2010042200;  // Requires this Moodle version
+$module->version  = 2010042300;
+$module->requires = 2010042300;  // Requires this Moodle version
 $module->cron     = 60;
 
 

diff --git a/mod/glossary/db/access.php b/mod/glossary/db/access.php
index 901dc79..1147e07 100644 (file)
--- a/mod/glossary/db/access.php
+++ b/mod/glossary/db/access.php
@@ -156,6 +156,32 @@ $capabilities = array(
         )
     ),
 
+    'mod/glossary:viewanyrating' => array(
+
+        'riskbitmask' => RISK_PERSONAL,
+        'captype' => 'read',
+        'contextlevel' => CONTEXT_MODULE,
+        'legacy' => array(
+            'teacher' => CAP_ALLOW,
+            'editingteacher' => CAP_ALLOW,
+            'manager' => CAP_ALLOW
+        ),
+        'clonepermissionsfrom' =>  'mod/glossary:viewrating'
+    ),
+
+    'mod/glossary:viewallratings' => array(
+
+        'riskbitmask' => RISK_PERSONAL,
+        'captype' => 'read',
+        'contextlevel' => CONTEXT_MODULE,
+        'legacy' => array(
+            'teacher' => CAP_ALLOW,
+            'editingteacher' => CAP_ALLOW,
+            'manager' => CAP_ALLOW
+        ),
+        'clonepermissionsfrom' =>  'mod/glossary:viewrating'
+    ),
+
     'mod/glossary:exportentry' => array(
 
         'riskbitmask' => RISK_PERSONAL,

diff --git a/mod/glossary/lang/en/glossary.php b/mod/glossary/lang/en/glossary.php
index e7c5662..b44788b 100644 (file)
--- a/mod/glossary/lang/en/glossary.php
+++ b/mod/glossary/lang/en/glossary.php
@@ -156,7 +156,9 @@ $string['glossary:manageentries'] = 'Manage entries';
 $string['glossary:rate'] = 'Rate entries';
 $string['glossarytype'] = 'Glossary Type';
 $string['glossary:view'] = 'View glossary';
-$string['glossary:viewrating'] = 'View ratings';
+$string['glossary:viewallratings'] = 'View all raw ratings given by individuals';
+$string['glossary:viewanyrating'] = 'View total ratings that anyone received';
+$string['glossary:viewrating'] = 'View the total rating you received';
 $string['glossary:write'] = 'Create new entries';
 $string['guestnoedit'] = 'Guests are not allowed to edit glossaries';
 $string['changeto'] = 'change to {$a}';

diff --git a/mod/glossary/version.php b/mod/glossary/version.php
index ffa7832..1f57397 100644 (file)
--- a/mod/glossary/version.php
+++ b/mod/glossary/version.php
@@ -5,8 +5,8 @@
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2010042200;
-$module->requires = 2010042200;  // Requires this Moodle version
+$module->version  = 2010042300;
+$module->requires = 2010042300;  // Requires this Moodle version
 $module->cron     = 0;           // Period for cron to check this module (secs)
 
 

diff --git a/version.php b/version.php
index df53222..d806aa1 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2010042200;  // YYYYMMDD   = date of the last version bump
+    $version = 2010042300;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20100423)';  // Human-friendly version name