Attachment 111558 Details for Bug 9118 – Bug 9118: Do not show option to create exception on range for unique holiday

[patch] Bug 9118: Do not show option to create exception on range for unique holiday

Bug-9118-Do-not-show-option-to-create-exception-on.patch (text/plain), 4.43 KB, created by Katrin Fischer on 2020-10-13 13:06:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-10-13 13:06:41 UTC

Size: 4.43 KB

patch

obsolete

>From d96f95005e027e5068b4dfbf0c1dd787a0c778cb Mon Sep 17 00:00:00 2001
>From: Emmi Takkinen <emmi.takkinen@outlook.com>
>Date: Mon, 5 Oct 2020 11:19:44 +0300
>Subject: [PATCH] Bug 9118: Do not show option to create exception on range for
> unique holiday
>
>When an unique holiday is edited one can choose
>option 'Generate exceptions on a range of dates.'
>Exceptions are meant to be used with repeating
>holidays and it makes no sense to have option to
>be able to create one for an unique holiday.
>
>This patch hides exception on range option when
>editing an unique holiday. Also fixes a minor
>spelling error.
>
>To test:
>1. Create unique holiday and edit it.
>2. Note that option to create exception on range is shown.
>3. Apply patch.
>=> Option is now hidden.
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
>index 62142d8dd6..99d91ad0f1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
>@@ -83,16 +83,17 @@ td.repeatableyearly a.ui-state-default {  background:  #FFCC66 none; color :  Bl
>                 <label for="showDescription">Description:</label>
>                 <textarea rows="2" cols="40" id="showDescription" name="showDescription"></textarea>
>             </li>
>-            <li class="radio"><div id="exceptionPosibility" style="position:static">
>+            <li class="radio"><div class="exceptionPossibility" style="position:static">
>                 <input type="radio" name="showOperation" id="showOperationExc" value="exception" /> <label for="showOperationExc">Generate an exception for this repeated holiday.</label>
>                 <a href="#" class="helptext">[?]</a>
>                 <div class="hint">You can make an exception for this holiday rule. This means that you will be able to say that for a repeatable holiday there is one day which is going to be an exception.</div>
>             </div></li>
>-            <li class="radio"><input type="radio" name="showOperation" id="showOperationExcRange" value="exceptionrange" />
>+            <li class="radio"><div class="exceptionPossibility" style="position:static">
>+                <input type="radio" name="showOperation" id="showOperationExcRange" value="exceptionrange" />
>                 <label for="showOperationExcRange">Generate exceptions on a range of dates.</label>
>                 <a href="#" class="helptext">[?]</a>
>                 <div class="hint">You can make an exception on a range of dates repeated yearly.</div>
>-            </li>
>+            </div></li>
>             <li class="radio"><input type="radio" name="showOperation" id="showOperationDel" value="delete" /> <label for="showOperationDel" id="showOperationDelLabel">Delete this holiday</label>
>                 <a href="#" class="helptext">[?]</a>
>                 <div class="hint">This will delete this holiday rule. If it is a repeatable holiday, this option checks for possible exceptions. If an exception exists, this option will remove the exception and set the date to a regular holiday.</div></li>
>@@ -383,7 +384,7 @@ td.repeatableyearly a.ui-state-default {  background:  #FFCC66 none; color :  Bl
>         }
> 
>         // This function shows the "Show Holiday" panel //
>-        function showHoliday (exceptionPosibility, dayName, day, month, year, weekDay, title, description, holidayType) {
>+        function showHoliday (exceptionPossibility, dayName, day, month, year, weekDay, title, description, holidayType) {
>             $("#newHoliday").slideUp("fast");
>             $("#showHoliday").slideDown("fast");
>             $('#showDaynameOutput').html(dayName);
>@@ -415,10 +416,10 @@ td.repeatableyearly a.ui-state-default {  background:  #FFCC66 none; color :  Bl
>                 $("#holtype").attr("class","key holiday").html(_("Unique holiday"));
>             }
> 
>-            if (exceptionPosibility == 1) {
>-                $("#exceptionPosibility").parent().show();
>+            if (exceptionPossibility == 1) {
>+                $(".exceptionPossibility").parent().show();
>             } else {
>-                $("#exceptionPosibility").parent().hide();
>+                $(".exceptionPossibility").parent().hide();
>             }
>         }
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 9118: 111214 | 111310 | 111558 | 111559