oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hide ending recurrent fields that are not used. Fixes bug #12020.

Browse source
This commit is contained in:
Colin Kuskie 2011-01-20 15:06:57 -08:00
parent 973363b14c
commit 1c3b2428b6
2 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -4,6 +4,7 @@
- fixed #12023: International URLs of aattachments & files in folder - fixed #12023: International URLs of aattachments & files in folder
- fixed #12024: Copied Collaboration System re-sends subscription mail - fixed #12024: Copied Collaboration System re-sends subscription mail
- fixed #12027: Wiki Search and Keyword security, pages visible to visitors when wiki is restricted. - fixed #12027: Wiki Search and Keyword security, pages visible to visitors when wiki is restricted.
- fixed #12020: Event Recurrend end date field is always active
7.10.7 7.10.7
- rfe #10521: Use monospaced font in template edit textarea - rfe #10521: Use monospaced font in template edit textarea

28
lib/WebGUI/Asset/Event.pm
View file

@ -2272,20 +2272,24 @@ sub www_edit {
# End # End
$var->{"formRecurEnd"} $var->{"formRecurEnd"}
= q| = q|
<div><input type="radio" name="recurEndType" id="recurEndType_none" value="none" |.(!$recur->{endDate} && !$recur->{endAfter} ? 'checked="checked"' : '').q|/> <div><input type="radio" name="recurEndType" id="recurEndType_none" value="none" |.(!$recur->{endDate} && !$recur->{endAfter} ? 'checked="checked"' : '').q| onclick="toggleRecurEnd()"/>
<label for="recurEndType_none">|. $i18n->get('No end'). q|</label><br /> <label for="recurEndType_none">|. $i18n->get('No end'). q|</label>
<input type="radio" name="recurEndType" id="recurEndType_date" value="date" |.($recur->{endDate} ? 'checked="checked"' : '' ).q| /> <input type="radio" name="recurEndType" id="recurEndType_date" value="date" |.($recur->{endDate} ? 'checked="checked"' : '' ).q| onclick="toggleRecurEnd()"/>
<label for="recurEndType_date">|. $i18n->get('By date'). q| </label>| <label for="recurEndType_date">|. $i18n->get('By date'). q| </label>
<div id="recurEndPattern_date"> |
. WebGUI::Form::date($session,{ name => "recurEndDate", value => $recur->{endDate}, defaultValue => $recur->{endDate} }) . WebGUI::Form::date($session,{ name => "recurEndDate", value => $recur->{endDate}, defaultValue => $recur->{endDate} })
. q| . q|
<br /> <br />
</div>
<input type="radio" name="recurEndType" id="recurEndType_after" value="after" |.($recur->{endAfter} ? 'checked="checked"' : '' ).q| /> <input type="radio" name="recurEndType" id="recurEndType_after" value="after" |.($recur->{endAfter} ? 'checked="checked"' : '' ).q| onclick="toggleRecurEnd()"/>
<label for="recurEndType_after">|. $i18n->get('After'). q| </label> <label for="recurEndType_after">|. $i18n->get('After'). q| </label>
<div id="recurEndPattern_after">
<input type="text" size="3" name="recurEndAfter" value="|.$recur->{endAfter}.q|" /> <input type="text" size="3" name="recurEndAfter" value="|.$recur->{endAfter}.q|" />
|. $i18n->get('occurences'). q|. |. $i18n->get('occurences'). q|.
</div> </div>
</div>
|; |;
# Include # Include
@ -2347,7 +2351,19 @@ sub www_edit {
document.getElementById("recurPattern_yearly").style.display = "block"; document.getElementById("recurPattern_yearly").style.display = "block";
} }
} }
YAHOO.util.Event.onAvailable("recurPattern",function(e) { toggleRecur(); });
function toggleRecurEnd() {
document.getElementById("recurEndPattern_date").style.display = "none";
document.getElementById("recurEndPattern_after").style.display = "none";
if (document.getElementById("recurEndType_date").checked) {
document.getElementById("recurEndPattern_date").style.display = "block";
}
else if (document.getElementById("recurEndType_after").checked) {
document.getElementById("recurEndPattern_after").style.display = "block";
}
}
YAHOO.util.Event.onAvailable("recurPattern",function(e) { toggleRecur(); toggleRecurEnd(); });
</script> </script>
ENDJS ENDJS