mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

MDL-32981 Filepicker: my private files uses edit page instead of view

Browse Source
This commit is contained in:
Frederic Massart 2012-05-21 13:00:31 +08:00
parent 71d7bc34a8
commit c598ea55fe
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/navigationlib.php
View File

@ -2305,7 +2305,7 @@ class global_navigation extends navigation_node {
$context = get_context_instance(CONTEXT_USER, $USER->id);
if ($iscurrentuser && has_capability('moodle/user:manageownfiles', $context)) {
$url = new moodle_url('/user/files.php');
$url = new moodle_url('/user/filesedit.php');
$usernode->add(get_string('myfiles'), $url, self::TYPE_SETTING);
}

12
user/filesedit.php
View File

@ -33,13 +33,11 @@ if (isguestuser()) {
}
$returnurl = optional_param('returnurl', '', PARAM_URL);
$returnbutton = true;
if (empty($returnurl)) {
if (!empty($_SERVER["HTTP_REFERER"])) {
$returnurl = $_SERVER["HTTP_REFERER"];
} else {
$returnurl = new moodle_url('/user/files.php');
}
$returnbutton = false;
$returnurl = new moodle_url('/user/filesedit.php');
}
$context = get_context_instance(CONTEXT_USER, $USER->id);
@ -48,7 +46,7 @@ require_capability('moodle/user:manageownfiles', $context);
$title = get_string('myfiles');
$struser = get_string('user');
$PAGE->set_url('/user/files.php');
$PAGE->set_url('/user/filesedit.php');
$PAGE->set_context($context);
$PAGE->set_title($title);
$PAGE->set_heading($title);
@ -60,7 +58,7 @@ $data->returnurl = $returnurl;
$options = array('subdirs'=>1, 'maxbytes'=>$CFG->userquota, 'maxfiles'=>-1, 'accepted_types'=>'*', 'return_types'=>FILE_INTERNAL);
file_prepare_standard_filemanager($data, 'files', $options, $context, 'user', 'private', 0);
$mform = new user_filesedit_form(null, array('data'=>$data, 'options'=>$options));
$mform = new user_filesedit_form(null, array('data'=>$data, 'options'=>$options, 'cancelbutton'=>$returnbutton));
if ($mform->is_cancelled()) {
redirect($returnurl);

7
user/filesedit_form.php
View File

@ -31,13 +31,14 @@ class user_filesedit_form extends moodleform {
function definition() {
$mform = $this->_form;
$data = $this->_customdata['data'];
$options = $this->_customdata['options'];
$data = $this->_customdata['data'];
$options = $this->_customdata['options'];
$cancelbutton = isset($this->_customdata['cancelbutton']) ? $this->_customdata['cancelbutton'] : true;
$mform->addElement('filemanager', 'files_filemanager', get_string('files'), null, $options);
$mform->addElement('hidden', 'returnurl', $data->returnurl);
$this->add_action_buttons(true, get_string('savechanges'));
$this->add_action_buttons($cancelbutton, get_string('savechanges'));
$this->set_data($data);
}