From: skodak Date: Mon, 23 Jul 2007 19:22:48 +0000 (+0000) Subject: MDL-9511 adding/renaming grading capabilities X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=dd45888a2468182532c1902609aa0239349ee13a;p=moodle.git MDL-9511 adding/renaming grading capabilities --- diff --git a/blocks/admin/block_admin.php b/blocks/admin/block_admin.php index 704714f62c..28d8022eba 100644 --- a/blocks/admin/block_admin.php +++ b/blocks/admin/block_admin.php @@ -156,8 +156,8 @@ class block_admin extends block_list { } /// View course grades (or just your own grades, same link) - if ((has_capability('moodle/course:viewcoursegrades', $context) or - (has_capability('moodle/user:viewusergrades', $context) && $course->showgrades)) && ($course->id!==SITEID)) { + if ((has_capability('moodle/grade:view', $context) or + (has_capability('moodle/grade:viewown', $context) && $course->showgrades)) && ($course->id!==SITEID)) { $this->content->items[]=''.get_string('grades').''; $this->content->icons[]=''; } diff --git a/grade/export/lib.php b/grade/export/lib.php index cac51e88f2..b277b21428 100755 --- a/grade/export/lib.php +++ b/grade/export/lib.php @@ -77,7 +77,7 @@ class grade_export { error("Course ID was incorrect"); } $context = get_context_instance(CONTEXT_COURSE, $id); - require_capability('moodle/course:viewcoursegrades', $context); + require_capability('moodle/grade:view', $context); $this->id = $id; $this->course = $course; diff --git a/grade/export/ods/index.php b/grade/export/ods/index.php index f97c15e6d1..54a9a5b40c 100755 --- a/grade/export/ods/index.php +++ b/grade/export/ods/index.php @@ -28,7 +28,7 @@ require_once('grade_export_ods.php'); $id = required_param('id', PARAM_INT); // course id require_login($id); -require_capability('moodle/course:downloadallgrades', get_context_instance(CONTEXT_COURSE, $id)); +require_capability('moodle/grade:export', get_context_instance(CONTEXT_COURSE, $id)); $course = get_record('course', 'id', $id); $feedback = optional_param('feedback', '', PARAM_ALPHA); diff --git a/grade/export/txt/index.php b/grade/export/txt/index.php index b44626cb99..ad681a00f7 100755 --- a/grade/export/txt/index.php +++ b/grade/export/txt/index.php @@ -28,7 +28,7 @@ require_once('grade_export_txt.php'); $id = required_param('id', PARAM_INT); // course id require_login($id); -require_capability('moodle/course:downloadallgrades', get_context_instance(CONTEXT_COURSE, $id)); +require_capability('moodle/grade:export', get_context_instance(CONTEXT_COURSE, $id)); $feedback = optional_param('feedback', '', PARAM_ALPHA); $course = get_record('course', 'id', $id); diff --git a/grade/export/xls/index.php b/grade/export/xls/index.php index 5dffbe4ca4..49dd07f4f4 100755 --- a/grade/export/xls/index.php +++ b/grade/export/xls/index.php @@ -28,7 +28,7 @@ require_once('grade_export_xls.php'); $id = required_param('id', PARAM_INT); // course id require_login($id); -require_capability('moodle/course:downloadallgrades', get_context_instance(CONTEXT_COURSE, $id)); +require_capability('moodle/grade:export', get_context_instance(CONTEXT_COURSE, $id)); $course = get_record('course', 'id', $id); $feedback = optional_param('feedback', '', PARAM_ALPHA); diff --git a/grade/export/xml/index.php b/grade/export/xml/index.php index f6020c975f..9c2ca8adce 100755 --- a/grade/export/xml/index.php +++ b/grade/export/xml/index.php @@ -28,7 +28,7 @@ require_once('grade_export_xml.php'); $id = required_param('id', PARAM_INT); // course id require_login($id); -require_capability('moodle/course:downloadallgrades', get_context_instance(CONTEXT_COURSE, $id)); +require_capability('moodle/grade:export', get_context_instance(CONTEXT_COURSE, $id)); $course = get_record('course', 'id', $id); $feedback = optional_param('feedback', '', PARAM_ALPHA); diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php index 76779acf40..1bbaa02061 100755 --- a/grade/import/csv/index.php +++ b/grade/import/csv/index.php @@ -7,7 +7,7 @@ $course = get_record('course', 'id', $id); // actual course // capability check require_login($id); -require_capability('moodle/course:managegrades', get_context_instance(CONTEXT_COURSE, $course->id)); +require_capability('moodle/grade:import', get_context_instance(CONTEXT_COURSE, $course->id)); require_once('../grade_import_form.php'); require_once($CFG->dirroot.'/grade/lib.php'); diff --git a/grade/import/xml/index.php b/grade/import/xml/index.php index 9eb04004c0..e03b383df9 100755 --- a/grade/import/xml/index.php +++ b/grade/import/xml/index.php @@ -11,7 +11,7 @@ $course = get_record('course', 'id', $id); // actual course // capability check require_login($id); -require_capability('moodle/course:managegrades', get_context_instance(CONTEXT_COURSE, $course->id)); +require_capability('moodle/grade:import', get_context_instance(CONTEXT_COURSE, $course->id)); require_once('../lib.php'); require_once('../grade_import_form.php'); diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php index 633021ea54..9ecaa429e4 100644 --- a/lang/en_utf8/role.php +++ b/lang/en_utf8/role.php @@ -24,11 +24,9 @@ $string['category:visibility'] = 'See hidden categories'; $string['course:activityvisibility'] = 'Hide/show activities'; $string['course:bulkmessaging'] = 'Send a message to many people'; $string['course:create'] = 'Create courses'; -$string['course:downloadallgrades'] = 'Download all grades'; $string['course:delete'] = 'Delete courses'; $string['course:manageactivities'] = 'Manage activities'; $string['course:managefiles'] = 'Manage files'; -$string['course:managegrades'] = 'Manage grades'; $string['course:managegroups'] = 'Manage groups'; $string['course:managemetacourse'] = 'Manage metacourse'; $string['course:managescales'] = 'Manage scales'; @@ -38,20 +36,23 @@ $string['course:setcurrentsection'] = 'Set current section'; $string['course:update'] = 'Update course settings'; $string['course:useremail'] = 'Enable/disable email address'; $string['course:view'] = 'View courses'; -$string['course:viewallgrades'] = 'View all grades'; -$string['course:viewcoursegrades'] = 'View course grades'; $string['course:viewhiddenactivities'] = 'View hidden activities'; $string['course:viewhiddencourses'] = 'View hidden courses'; $string['course:viewhiddensections'] = 'View hidden sections'; $string['course:viewhiddenuserfields'] = 'View hidden user fields'; -$string['course:viewowngrades'] = 'View own grades'; $string['course:viewparticipants'] = 'View participants'; $string['course:viewscales'] = 'View scales'; $string['course:visibility'] = 'Hide/show courses'; -$string['grade:editlocked'] = 'Edit locked grades'; -$string['grade:hide'] = 'Hide grade'; -$string['grade:lock'] = 'Lock grade'; -$string['grade:viewhidden'] = 'View hidden grade'; +$string['grade:export'] = 'Export grades'; +$string['grade:hide'] = 'Hide/unhide grades or items'; +$string['grade:import'] = 'Import grades'; +$string['grade:lock'] = 'Lock grades or items'; +$string['grade:manage'] = 'Manage grade items'; +$string['grade:override'] = 'Override grades'; +$string['grade:unlock'] = 'Unlock grades or items'; +$string['grade:view'] = 'View own grades (or other user)'; +$string['grade:viewall'] = 'View all grades of all users'; +$string['grade:viewhidden'] = 'View own hidden grades (or other user)'; $string['currentcontext'] = 'Current context'; $string['currentrole'] = 'Current role'; $string['defaultrole'] = 'Default role'; @@ -137,7 +138,6 @@ $string['user:update'] = 'Update user profiles'; $string['user:viewdetails'] = 'View user profiles'; $string['user:viewhiddendetails'] = 'View hidden details of users'; $string['user:viewuseractivitiesreport'] = 'See user activity reports'; -$string['user:viewusergrades'] = 'View user grades'; $string['viewrole'] = 'View role details'; $string['xuserswiththerole'] = 'Users with the role \"$a->role\": $a->number'; @@ -149,4 +149,9 @@ $string['site:mnetloginfromremote'] = 'Login from a remote Moodle'; $string['notes:view'] = 'View notes'; $string['notes:manage'] = 'Manage notes'; +//OBSOLETED in 1.9! +$string['course:viewcoursegrades'] = 'View course grades'; +$string['user:viewusergrades'] = 'View user grades'; +$string['course:managegrades'] = 'Manage grades'; + ?> diff --git a/lib/db/access.php b/lib/db/access.php index 6267042c3f..5e05d43244 100644 --- a/lib/db/access.php +++ b/lib/db/access.php @@ -298,18 +298,6 @@ $moodle_capabilities = array( ) ), - 'moodle/user:viewusergrades' => array( - - 'captype' => 'write', - 'contextlevel' => CONTEXT_COURSE, - 'legacy' => array( - 'student' => CAP_ALLOW, - 'teacher' => CAP_ALLOW, - 'editingteacher' => CAP_ALLOW, - 'admin' => CAP_ALLOW - ) - ), - 'moodle/user:loginas' => array( 'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_CONFIG, @@ -896,64 +884,56 @@ $moodle_capabilities = array( ) ), - 'moodle/course:viewcoursegrades' => array( - - 'riskbitmask' => RISK_PERSONAL, - + 'moodle/site:mnetlogintoremote' => array( + 'riskbitmask' => RISK_PERSONAL | RISK_XSS, 'captype' => 'read', - 'contextlevel' => CONTEXT_COURSE, + 'contextlevel' => CONTEXT_SYSTEM, 'legacy' => array( - 'teacher' => CAP_ALLOW, - 'editingteacher' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), - 'moodle/course:managegrades' => array( - + 'moodle/grade:viewall' => array( 'riskbitmask' => RISK_PERSONAL, - - 'captype' => 'write', + 'captype' => 'read', 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( + 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, 'admin' => CAP_ALLOW - ) + ), + 'clonepermissionsfrom' => 'moodle/course:viewcoursegrades' ), - 'moodle/site:mnetlogintoremote' => array( - 'riskbitmask' => RISK_PERSONAL | RISK_XSS, + 'moodle/grade:view' => array( 'captype' => 'read', - 'contextlevel' => CONTEXT_SYSTEM, + 'contextlevel' => CONTEXT_COURSE, // and CONTEXT_PERSONAL too 'legacy' => array( - 'admin' => CAP_ALLOW + 'student' => CAP_ALLOW ) ), - - 'moodle/course:viewowngrades' => array( + + 'moodle/grade:viewhidden' => array( 'riskbitmask' => RISK_PERSONAL, 'captype' => 'read', - 'contextlevel' => CONTEXT_COURSE, + 'contextlevel' => CONTEXT_COURSE, // and CONTEXT_PERSONAL too 'legacy' => array( - 'student' => CAP_ALLOW, - 'teacher' => CAP_ALLOW, - 'editingteacher' => CAP_ALLOW, - 'admin' => CAP_ALLOW - ) + ), + 'clonepermissionsfrom' => 'moodle/course:viewcoursegrades' ), - - 'moodle/course:viewallgrades' => array( + + 'moodle/grade:import' => array( 'riskbitmask' => RISK_PERSONAL, - 'captype' => 'read', + 'captype' => 'write', 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( - 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, 'admin' => CAP_ALLOW - ) + ), + 'clonepermissionsfrom' => 'moodle/course:managegrades' ), - - 'moodle/course:downloadallgrades' => array( + + 'moodle/grade:export' => array( 'riskbitmask' => RISK_PERSONAL, 'captype' => 'read', 'contextlevel' => CONTEXT_COURSE, @@ -961,18 +941,21 @@ $moodle_capabilities = array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, 'admin' => CAP_ALLOW - ) + ), + 'clonepermissionsfrom' => 'moodle/course:managegrades' ), - - 'moodle/user:viewusergrades' => array( + + 'moodle/grade:manage' => array( 'riskbitmask' => RISK_PERSONAL, - 'captype' => 'read', - 'contextlevel' => CONTEXT_USER, + 'captype' => 'write', + 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( + 'editingteacher' => CAP_ALLOW, 'admin' => CAP_ALLOW - ) + ), + 'clonepermissionsfrom' => 'moodle/course:managegrades' ), - + 'moodle/grade:hide' => array( 'captype' => 'write', 'contextlevel' => CONTEXT_COURSE, @@ -981,7 +964,7 @@ $moodle_capabilities = array( 'admin' => CAP_ALLOW ) ), - + 'moodle/grade:lock' => array( 'captype' => 'write', 'contextlevel' => CONTEXT_COURSE, @@ -990,17 +973,17 @@ $moodle_capabilities = array( 'admin' => CAP_ALLOW ) ), - - 'moodle/grade:viewhidden' => array( - 'captype' => 'read', + + 'moodle/grade:unlock' => array( + 'captype' => 'write', 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), - - 'moodle/grade:editlocked' => array( + + 'moodle/grade:override' => array( 'captype' => 'write', 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( @@ -1008,15 +991,15 @@ $moodle_capabilities = array( 'admin' => CAP_ALLOW ) ), - - 'moodle/my:manageblocks' => array( + + 'moodle/my:manageblocks' => array( 'captype' => 'write', 'contextlevel' => CONTEXT_SYSTEM, 'legacy' => array( 'user' => CAP_ALLOW ) ), - + 'moodle/notes:view' => array( 'captype' => 'read', 'contextlevel' => CONTEXT_SYSTEM, @@ -1035,7 +1018,7 @@ $moodle_capabilities = array( 'editingteacher' => CAP_ALLOW, 'admin' => CAP_ALLOW ) - ), + ), ); ?> diff --git a/version.php b/version.php index 22dc0b9059..8cd3f83d4e 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 = 2007072201; // YYYYMMDD = date + $version = 2007072303; // YYYYMMDD = date // XY = increments within a single day $release = '1.9 dev'; // Human-friendly version name