faee3db96b
- Update www/vdr-plugin-live to 0.3.0 with patches merged from the git 0.3.0 branch. (stagifying the vdr ports left for later.) - Use new LIB_DEPENDS syntax. - Rewrite NOPORTDOCS.
66 lines
2.2 KiB
Text
66 lines
2.2 KiB
Text
From 1a1f2e0754b02c5597debbe82f27b759f23cd6fe Mon Sep 17 00:00:00 2001
|
|
From: Dieter Hametner
|
|
Date: Fri, 12 Apr 2013 23:02:02 +0000
|
|
Subject: Fixed status toggle of timers, via the edit_timer dialog.
|
|
|
|
This bug was reported by user 'mhanu' in bug #1332.
|
|
---
|
|
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");
|
|
}
|
|
}
|
|
|
|
--
|
|
cgit v0.9.0.2-40-g7c79
|