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

MDL-60587 calendar: Improve link params for calendar buttons

Browse Source
This commit is contained in:
Andrew Nicols
2017-11-02 21:49:28 +08:00
parent 6607c5ffb6
commit 30ff29dc9f
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/classes/external/footer_options_exporter.php
Vendored
+22 -5
View File
@@ -72,8 +72,8 @@ class footer_options_exporter extends exporter {
* @return \single_button The export calendar button html.
*/
protected function get_export_calendar_button() {
$exportcalendarurl = new moodle_url('/calendar/export.php', ['course' => $this->calendar->course->id]);
return new \single_button($exportcalendarurl, get_string('exportcalendar', 'calendar'));
$exportcalendarurl = new moodle_url('/calendar/export.php', $this->get_link_params());
return new \single_button($exportcalendarurl, get_string('exportcalendar', 'calendar'), 'get');
}
/**
@@ -83,13 +83,30 @@ class footer_options_exporter extends exporter {
*/
protected function get_manage_subscriptions_button() {
if (calendar_user_can_add_event($this->calendar->course)) {
$managesubscriptionurl = new moodle_url('/calendar/managesubscriptions.php',
['course' => $this->calendar->course->id]);
$managesubscriptionurl = new moodle_url('/calendar/managesubscriptions.php', $this->get_link_params());
return new \single_button($managesubscriptionurl,
get_string('managesubscriptions', 'calendar'));
get_string('managesubscriptions', 'calendar'), 'get');
}
}
/**
* Get the list of URL parameters for calendar links.
*
* @return array
*/
protected function get_link_params() {
$params = [];
if (SITEID !== $this->calendar->course->id) {
$params['course'] = $this->calendar->course->id;
} else if (null !== $this->calendar->categoryid && $this->calendar->categoryid > 0) {
$params['category'] = $this->calendar->categoryid;
} else {
$params['course'] = SITEID;
}
return $params;
}
/**
* Get the additional values to inject while exporting.
*
version.php
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2017110200.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2017110200.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.