summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2013-04-12 23:02:02 (GMT)
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2013-04-12 23:02:02 (GMT)
commit1a1f2e0754b02c5597debbe82f27b759f23cd6fe (patch)
treefe8345ebcada98c907fe011cc60cd9c7ce756443
parent9f56065e62206700b5ab22a9af4d4a253a714d48 (diff)
downloadvdr-plugin-live-1a1f2e0754b02c5597debbe82f27b759f23cd6fe.tar.gz
vdr-plugin-live-1a1f2e0754b02c5597debbe82f27b759f23cd6fe.tar.bz2
Fixed status toggle of timers, via the edit_timer dialog.
This bug was reported by user 'mhanu' in bug #1332.
-rw-r--r--pages/edit_timer.ecpp8
-rw-r--r--pages/timers.ecpp2
2 files changed, 6 insertions, 4 deletions
diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp
index 299f35a..0fe253c 100644
--- a/pages/edit_timer.ecpp
+++ b/pages/edit_timer.ecpp
@@ -26,7 +26,7 @@ using namespace vdrlive;
string async;
// form parameters
tChannelID channel;
- bool active = true;
+ int active = 1;
string title = "";
string date = "";
bool wday_mon = false;
@@ -44,7 +44,7 @@ using namespace vdrlive;
int priority = 0;
int lifetime = 0;
string aux = "";
- string directory = "";
+ string directory = "";
</%args>
<%session scope="global">
bool logged_in(false);
@@ -141,7 +141,7 @@ cTimer* timer;
title = title.substr(directory.size()+1);
}
}
- // TRANSLATORS: only adjust the ordering and separators, don't translate the m's, d's and y's
+ // TRANSLATORS: only adjust the ordering and separators, don't translate the m's, d's and y's
date = timer->Day() ? DatePickerToC(timer->Day(), tr("mm/dd/yyyy")) : "";
wday_mon = timer->WeekDays() & 0x01;
wday_tue = timer->WeekDays() & 0x02;
@@ -226,7 +226,7 @@ cTimer* timer;
for (RecordingDirs::iterator rdir = recordingdirs.begin(); rdir != recordingdirs.end(); ++rdir) {
std::string dir = *rdir;
</%cpp>
- <option value="<$ dir $>"
+ <option value="<$ dir $>"
% if (*rdir == directory) {
selected="selected"
% }
diff --git a/pages/timers.ecpp b/pages/timers.ecpp
index 2a9ee4c..66b5235 100644
--- a/pages/timers.ecpp
+++ b/pages/timers.ecpp
@@ -49,10 +49,12 @@ static const size_t maximumDescriptionLength = 300;
throw HtmlError( tr("Sorry, no permission. Please contact your administrator!") );
LiveTimerManager().DelTimer(timer);
timerNotifier.SetTimerModification();
+ return reply.redirect("timers.html");
}
if (action == "toggle") {
LiveTimerManager().ToggleTimerActive(timer);
timerNotifier.SetTimerModification();
+ return reply.redirect("timers.html");
}
}