L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-21666 backup & restore caps - renaming the import one

Browse Source
This commit is contained in:
Eloy Lafuente
2010-02-19 19:11:06 +00:00
parent 2fdde5d178
commit 157aa3a22d
7 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/restore.php
+1 -1
View File
@@ -80,7 +80,7 @@
print_error("cannotuseadminadminorteacher", '', $loginurl);
} else {
if (!has_capability('moodle/restore:restorecourse', get_context_instance(CONTEXT_COURSE, $to))
&& !has_capability('moodle/site:import', get_context_instance(CONTEXT_COURSE, $to))) {
&& !has_capability('moodle/restore:restoretargetimport', get_context_instance(CONTEXT_COURSE, $to))) {
print_error("cannotuseadminadminorteacher", '', $loginurl);
}
}
backup/restore_execute.html
+1 -1
View File
@@ -48,7 +48,7 @@
print_error("cannotuseadminadminorteacher", '', $loginurl);
} else {
if (!has_capability('moodle/restore:restorecourse', get_context_instance(CONTEXT_COURSE, $to))
&& !has_capability('moodle/site:import', get_context_instance(CONTEXT_COURSE, $to))) {
&& !has_capability('moodle/restore:restoretargetimport', get_context_instance(CONTEXT_COURSE, $to))) {
print_error("cannotuseadminadminorteacher", '', $loginurl);
}
}
backup/restore_precheck.html
+1 -1
View File
@@ -21,7 +21,7 @@
print_error("cannotuseadminadminorteacher", '', $loginurl);
} else {
if (!has_capability('moodle/restore:restorecourse', get_context_instance(CONTEXT_COURSE, $to))
&& !has_capability('moodle/site:import', get_context_instance(CONTEXT_COURSE, $to))) {
&& !has_capability('moodle/restore:restoretargetimport', get_context_instance(CONTEXT_COURSE, $to))) {
print_error("cannotuseadminadminorteacher", '', $loginurl);
}
}
blocks/admin/block_admin.php
+1 -1
View File
@@ -121,7 +121,7 @@ class block_admin extends block_list {
}
/// Import data from other courses
if ($course->id !== SITEID and has_capability('moodle/site:import', $this->page->context)) {
if ($course->id !== SITEID and has_capability('moodle/restore:restoretargetimport', $this->page->context)) {
$this->content->items[]='<a href="'.$CFG->wwwroot.'/course/import.php?id='.$course->id.'">'.get_string('import').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/restore') . '" class="icon" alt="" />';
}
course/import.php
+1 -1
View File
@@ -35,7 +35,7 @@ if (!$course = $DB->get_record('course', array('id'=>$id))) {
require_login($course->id);
require_capability('moodle/site:import', get_context_instance(CONTEXT_COURSE, $id));
require_capability('moodle/restore:restoretargetimport', get_context_instance(CONTEXT_COURSE, $id));
/// Always we begin an import, we delete all backup/restore/import session structures
if (isset($SESSION->course_header)) {
lib/db/access.php
+25 -23
View File
@@ -141,18 +141,6 @@ $capabilities = array(
)
),
'moodle/site:import' => array(
'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
'editingteacher' => CAP_ALLOW,
'admin' => CAP_ALLOW
)
),
'moodle/backup:backupcourse' => array(
'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
@@ -206,6 +194,20 @@ $capabilities = array(
'clonepermissionsfrom' => 'moodle/site:restore'
),
'moodle/restore:restoretargetimport' => array(
'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
'editingteacher' => CAP_ALLOW,
'admin' => CAP_ALLOW
),
'clonepermissionsfrom' => 'moodle/site:import'
),
'moodle/restore:uploadfile' => array(
'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
@@ -220,17 +222,6 @@ $capabilities = array(
'clonepermissionsfrom' => 'moodle/site:backupupload'
),
'moodle/restore:createuser' => array(
'riskbitmask' => RISK_SPAM | RISK_PERSONAL,
'captype' => 'write',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
'admin' => CAP_ALLOW
)
),
'moodle/restore:userinfo' => array(
'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_CONFIG,
@@ -242,6 +233,17 @@ $capabilities = array(
)
),
'moodle/restore:createuser' => array(
'riskbitmask' => RISK_SPAM | RISK_PERSONAL,
'captype' => 'write',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
'admin' => CAP_ALLOW
)
),
'moodle/restore:rolldates' => array(
'captype' => 'write',
lib/navigationlib.php
+1 -1
View File
@@ -2929,7 +2929,7 @@ class settings_navigation extends navigation_node {
}
// Import data from other courses
if (has_capability('moodle/site:import', $course->context)) {
if (has_capability('moodle/restore:restoretargetimport', $course->context)) {
$url = new moodle_url('/course/import.php', array('id'=>$course->id));
$coursenode->add(get_string('import'), $url, self::TYPE_SETTING, null, null, new pix_icon('i/restore', ''));
}