Skip to content
Browse files

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

  • Loading branch information...
1 parent 71d7bc3 commit c598ea55fe41ac68003a0d60a1b414e0d8007343 @FMCorz FMCorz committed May 21, 2012
Showing with 10 additions and 11 deletions.
  1. +1 −1 lib/navigationlib.php
  2. +5 −7 user/filesedit.php
  3. +4 −3 user/filesedit_form.php
View
2 lib/navigationlib.php
@@ -2305,7 +2305,7 @@ protected function load_for_user($user=null, $forceforcontext=false) {
$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);
}
View
12 user/filesedit.php
@@ -33,13 +33,11 @@
}
$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 @@
$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 @@
$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);
View
7 user/filesedit_form.php
@@ -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);
}

0 comments on commit c598ea5

Please sign in to comment.
Something went wrong with that request. Please try again.