moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-41485 calendar: Replace value of action buttons on managesubscription page with int

Browse source
This commit is contained in:
Ankit Agarwal 2013-08-29 14:54:26 +08:00
parent d2aa53be1b
commit ee74a2a19e
3 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
calendar/lib.php
View file

@ -110,6 +110,16 @@ define('CALENDAR_IMPORT_EVENT_UPDATED', 1);
*/ */
define('CALENDAR_IMPORT_EVENT_INSERTED', 2); define('CALENDAR_IMPORT_EVENT_INSERTED', 2);
/**
* CALENDAR_SUBSCRIPTION_UPDATE - Used to represent update action for subscriptions in various forms.
*/
define('CALENDAR_SUBSCRIPTION_UPDATE', 1);
/**
* CALENDAR_SUBSCRIPTION_REMOVE - Used to represent remove action for subscriptions in various forms.
*/
define('CALENDAR_SUBSCRIPTION_REMOVE', 2);
/** /**
* Return the days of the week * Return the days of the week
* *
@ -2914,17 +2924,13 @@ function calendar_add_icalendar_event($event, $courseid, $subscriptionid) {
* @return string A log of the import progress, including errors * @return string A log of the import progress, including errors
*/ */
function calendar_process_subscription_row($subscriptionid, $pollinterval, $action) { function calendar_process_subscription_row($subscriptionid, $pollinterval, $action) {
global $DB;
// Fetch the subscription from the database making sure it exists. // Fetch the subscription from the database making sure it exists.
$sub = calendar_get_subscription($subscriptionid); $sub = calendar_get_subscription($subscriptionid);
$strupdate = get_string('update');
$strremove = get_string('remove');
// Update or remove the subscription, based on action. // Update or remove the subscription, based on action.
switch ($action) { switch ($action) {
case $strupdate: case CALENDAR_SUBSCRIPTION_UPDATE:
// Skip updating file subscriptions. // Skip updating file subscriptions.
if (empty($sub->url)) { if (empty($sub->url)) {
break; break;
@ -2935,7 +2941,7 @@ function calendar_process_subscription_row($subscriptionid, $pollinterval, $acti
// Update the events. // Update the events.
return "<p>".get_string('subscriptionupdated', 'calendar', $sub->name)."</p>" . calendar_update_subscription_events($subscriptionid); return "<p>".get_string('subscriptionupdated', 'calendar', $sub->name)."</p>" . calendar_update_subscription_events($subscriptionid);
case $strremove: case CALENDAR_SUBSCRIPTION_REMOVE:
calendar_delete_subscription($subscriptionid); calendar_delete_subscription($subscriptionid);
return get_string('subscriptionremoved', 'calendar', $sub->name); return get_string('subscriptionremoved', 'calendar', $sub->name);
break; break;

2
calendar/managesubscriptions.php
View file

@ -33,7 +33,7 @@ $courseid = optional_param('course', SITEID, PARAM_INT);
// Used for processing subscription actions. // Used for processing subscription actions.
$subscriptionid = optional_param('id', 0, PARAM_INT); $subscriptionid = optional_param('id', 0, PARAM_INT);
$pollinterval = optional_param('pollinterval', 0, PARAM_INT); $pollinterval = optional_param('pollinterval', 0, PARAM_INT);
$action = optional_param('action', '', PARAM_ALPHA); $action = optional_param('action', '', PARAM_INT);
$url = new moodle_url('/calendar/managesubscriptions.php'); $url = new moodle_url('/calendar/managesubscriptions.php');
if ($courseid != SITEID) { if ($courseid != SITEID) {

6
calendar/renderer.php
View file

@ -836,9 +836,11 @@ class core_calendar_renderer extends plugin_renderer_base {
$html .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'course', 'value' => $courseid)); $html .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'course', 'value' => $courseid));
$html .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'id', 'value' => $subscription->id)); $html .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'id', 'value' => $subscription->id));
if (!empty($subscription->url)) { if (!empty($subscription->url)) {
$html .= html_writer::empty_tag('input', array('type' => 'submit', 'name' => 'action', 'value' => get_string('update'))); $html .= html_writer::tag('button', get_string('update'), array('type' => 'submit', 'name' => 'action',
'value' => CALENDAR_SUBSCRIPTION_UPDATE));
} }
$html .= html_writer::empty_tag('input', array('type' => 'submit', 'name' => 'action', 'value' => get_string('remove'))); $html .= html_writer::tag('button', get_string('remove'), array('type' => 'submit', 'name' => 'action',
'value' => CALENDAR_SUBSCRIPTION_REMOVE));
$html .= html_writer::end_tag('div'); $html .= html_writer::end_tag('div');
$html .= html_writer::end_tag('form'); $html .= html_writer::end_tag('form');
return $html; return $html;