From: skodak <skodak>
Date: Sat, 29 Nov 2008 16:41:20 +0000 (+0000)
Subject: MDL-17463 chnging progress report cap to new standard
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0d13085755aca866d6e651238ba549ad38116b8c;p=moodle.git

MDL-17463 chnging progress report cap to new standard
---

diff --git a/course/report/progress/db/access.php b/course/report/progress/db/access.php
new file mode 100644
index 0000000000..da27d3f2e3
--- /dev/null
+++ b/course/report/progress/db/access.php
@@ -0,0 +1,42 @@
+<?php  // $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+$coursereport_progress_capabilities = array(
+
+    'coursereport/progress:view' => array(
+        'riskbitmask' => RISK_PERSONAL,
+        'captype' => 'read',
+        'contextlevel' => CONTEXT_COURSE,
+        'legacy' => array(
+            'teacher' => CAP_ALLOW,
+            'editingteacher' => CAP_ALLOW,
+            'admin' => CAP_ALLOW
+        ),
+
+        'clonepermissionsfrom' => 'moodle/site:viewreports',
+    )
+);
+
+?>
diff --git a/course/report/progress/index.php b/course/report/progress/index.php
index 4d03f5ab2a..f91fcb8be7 100644
--- a/course/report/progress/index.php
+++ b/course/report/progress/index.php
@@ -41,7 +41,7 @@ require_login($course);
 
 // Check basic permission
 $context=get_context_instance(CONTEXT_COURSE,$course->id);
-require_capability('moodle/course:viewprogress',$context);
+require_capability('coursereport/progress:view',$context);
 
 // Get group mode
 $group=groups_get_course_group($course,true); // Supposed to verify group
diff --git a/course/report/progress/mod.php b/course/report/progress/mod.php
index b6418bff30..a2428a2bd1 100644
--- a/course/report/progress/mod.php
+++ b/course/report/progress/mod.php
@@ -4,9 +4,9 @@
         die('Direct access to this script is forbidden.'); // It must be included from a Moodle page
     }
 
-    if (has_capability('moodle/course:viewprogress', $context)) {
+    if (has_capability('coursereport/progress:view', $context)) {
         $completion = new completion_info($course);
-        if ($completion->is_enabled() && has_capability('moodle/course:viewprogress', $context)) {
+        if ($completion->is_enabled()) {
             echo '<p>';
             echo '<a href="'.$CFG->wwwroot.'/course/report/progress/?course='.$course->id.'">'.get_string('completionreport','completion').'</a>';
             echo '</p>';
diff --git a/course/report/progress/version.php b/course/report/progress/version.php
new file mode 100644
index 0000000000..c62920f9d7
--- /dev/null
+++ b/course/report/progress/version.php
@@ -0,0 +1,29 @@
+<?PHP // $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+$plugin->version  = 2007101500;
+$plugin->requires = 2007101532;
+
+?>
diff --git a/lang/en_utf8/coursereport_progress.php b/lang/en_utf8/coursereport_progress.php
new file mode 100644
index 0000000000..11c3ed6654
--- /dev/null
+++ b/lang/en_utf8/coursereport_progress.php
@@ -0,0 +1,5 @@
+<?PHP // $Id$
+
+$string['progress:view'] = 'View course progress report';
+
+?>
diff --git a/lib/db/access.php b/lib/db/access.php
index b0c2864b6d..b4a7d2a8a3 100644
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -567,19 +567,6 @@ $moodle_capabilities = array(
         )
     ),
 
-    'moodle/course:viewprogress' => array(
-
-        'riskbitmask' => RISK_PERSONAL,
-
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    ),
-
     'moodle/course:viewhiddencourses' => array(
 
         'captype' => 'read',
diff --git a/version.php b/version.php
index 9add45692a..9430795091 100644
--- 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 = 2008112901;  // YYYYMMDD   = date of the last version bump
+    $version = 2008112902;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20081128)';  // Human-friendly version name