Bugzilla – Attachment 10743 Details for
Bug 7688
Change subscriptions numbering pattern and frequencies
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7688: replace yui datepicker with jQuery datepicker (subscription-add)
Bug-7688-replace-yui-datepicker-with-jQuery-datepi.patch (text/plain), 11.64 KB, created by
Jonathan Druart
on 2012-07-10 12:18:02 UTC
(
hide
)
Description:
Bug 7688: replace yui datepicker with jQuery datepicker (subscription-add)
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2012-07-10 12:18:02 UTC
Size:
11.64 KB
patch
obsolete
>From d0229a96843ac74b875d400b723856194303212e Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Tue, 10 Jul 2012 14:11:26 +0200 >Subject: [PATCH] Bug 7688: replace yui datepicker with jQuery datepicker > (subscription-add) > >--- > .../prog/en/modules/serials/subscription-add.tt | 96 +++----------------- > serials/subscription-add.pl | 2 +- > 2 files changed, 13 insertions(+), 85 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >index 3f0ac56..dfb0bd0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >@@ -81,11 +81,11 @@ function Check_page2(){ > alert(_("You must choose a frequency")); > return false; > } >- if($("#startdate").val().length == 0){ >+ if($("input[name='startdate']").val().length == 0){ > alert(_("You must choose a start date")); > return false; > } >- if($("#sublength").val().length == 0 && $("#enddate").val().length == 0){ >+ if($("#sublength").val().length == 0 && $("input[name='enddate']").val().length == 0){ > alert(_("You must choose a subscription length or an end date.")); > return false; > } >@@ -286,7 +286,7 @@ function testPredictionPattern() { > 'firstacquidate': acquidate > }; > var ajaxParams = [ >- 'enddate', 'subtype', 'sublength', 'frequency', 'numberingmethod', >+ 'to', 'subtype', 'sublength', 'frequency', 'numberingmethod', > 'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3', > 'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3', > 'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3', >@@ -370,7 +370,7 @@ function show_page_2() { > $(document).ready(function() { > $("select#frequency").change(function(){ > patternneedtobetested = 1; >- $("#enddate").val(''); >+ $("input[name='enddate']").val(''); > frequencyload(); > }); > $("select#numberpattern").change(function(){ >@@ -378,10 +378,10 @@ $(document).ready(function() { > numberpatternload(); > }); > $("#subtype").change(function(){ >- $("#enddate").val(''); >+ $("input[name='enddate']").val(''); > }); > $("#sublength").change(function(){ >- $("#enddate").val(''); >+ $("input[name='enddate']").val(''); > }); > $("#lastvaluetemp1").keyup(function(){ > $("#lastvalue1").val($(this).val()); >@@ -616,51 +616,16 @@ $(document).ready(function() { > <li> > <label for="firstacquidate">First issue publication date: (*)</label> > [% UNLESS (more_than_one_serial) %] >- <input type="text" name="firstacquidate" value="[% firstacquidate %]" size="13" maxlength="10" id="acqui_date" readonly="readonly" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="button2" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" /> >- <!-- both scripts for calendar must follow the input field --> >- <script type="text/javascript"> >- Calendar.setup({ >- inputField:"acqui_date", >- ifFormat : "[% DHTMLcalendar_dateformat %]", >- button : "button2", >- align : "Tl" >- }); >- </script> >- <script type="text/javascript"> >- Calendar.setup({ >- inputField : "acqui_date", >- ifFormat : "[% DHTMLcalendar_dateformat %]", >- button : "acqui_date", >- align : "Tl" >- }); >- </script> >+ <input type="text" size="10" id="acqui_date" name="firstacquidate" value="[% firstacquidate | $KohaDates %]" class="datepicker" readonly="readonly"/> > [% ELSE %] >- [% firstacquidate %] >- <input type="hidden" id="acqui_date" name="firstacquidate" value="[% firstacquidate %]" /> >+ [% firstacquidate | $KohaDates %] >+ <input type="hidden" size="10" id="acqui_date" name="firstacquidate" value="[% firstacquidate | $KohaDates %]"/> > [% END %] > </li> > [% IF (more_than_one_serial) %] > <li> > <label for="nextacquidate">Next issue publication date:</label> >- <input type="text" id="nextacquidate" name="nextacquidate" size="13" readonly="readonly" value="[% nextacquidate | $KohaDates %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="nextacquidatebutton" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" /> >- <script type="text/javascript"> >- Calendar.setup({ >- inputField: "nextacquidate", >- ifFormat: "[% DHTMLcalendar_dateformat %]", >- button: "nextacquidatebutton", >- align: "Tl" >- }); >- </script> >- <script type="text/javascript"> >- Calendar.setup({ >- inputField: "nextacquidate", >- ifFormat: "[% DHTMLcalendar_dateformat %]", >- button: "nextacquidate", >- align: "Tl" >- }); >- </script> >+ <input type="text" size="10" id="nextacquidate" name="nextacquidate" value="[% nextacquidate | $KohaDates %]" class="datepicker" readonly="readonly"/> > </li> > [% END %] > <li> >@@ -688,48 +653,11 @@ $(document).ready(function() { > </li> > <li> > <label for="startdate"> Subscription start date: (*)</label> >- <input type="text" name="startdate" value="[% startdate %]" size="13" maxlength="10" id="startdate" readonly="readonly" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="button1" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" /> >- <!-- both scripts for calendar must follow the input field --> >- <script type="text/javascript"> >- Calendar.setup({ >- inputField : "startdate", >- ifFormat : "[% DHTMLcalendar_dateformat %]", >- button : "button1", >- align : "Tl" >- }); >- </script> >- <script type="text/javascript"> >- Calendar.setup({ >- inputField : "startdate", >- ifFormat : "[% DHTMLcalendar_dateformat %]", >- button : "startdate", >- align : "Tl" >- }); >- </script> >+ <input type="text" size="10" id="from" name="startdate" value="[% startdate | $KohaDates %]" class="datepickerfrom" readonly="readonly"/> > </li> > <li> > <label for="enddate">Subscription end date:</label> >- <input type="text" name="enddate" value="[% enddate %]" size="13" maxlength="10" id="enddate" readonly="readonly" /> >- <a title="Clear" style="cursor:pointer" onclick="Clear('enddate');">Χ</a> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="button3" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" /> >- <!-- both scripts for calendar must follow the input field --> >- <script type="text/javascript"> >- Calendar.setup({ >- inputField : "enddate", >- ifFormat : "[% DHTMLcalendar_dateformat %]", >- button : "button3", >- align : "Tl" >- }); >- </script> >- <script type="text/javascript"> >- Calendar.setup({ >- inputField : "enddate", >- ifFormat : "[% DHTMLcalendar_dateformat %]", >- button : "enddate", >- align : "Tl" >- }); >- </script> >+ <input type="text" size="10" id="to" name="enddate" value="[% enddate | $KohaDates %]" class="datepickerto" readonly="readonly"/> > </li> > <li> > <label for="numberpattern"> Numbering pattern:</label> >diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl >index a02643f..cddd485 100755 >--- a/serials/subscription-add.pl >+++ b/serials/subscription-add.pl >@@ -81,7 +81,7 @@ if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { > if ($subs->{$_} eq '0000-00-00') { > $subs->{$_} = '' > } else { >- $subs->{$_} = format_date($subs->{$_}); >+ $subs->{$_} = $subs->{$_}; > } > } > if (!defined $subs->{letter}) { >-- >1.7.7.3
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7688
:
8110
|
8941
|
8942
|
8943
|
10145
|
10146
|
10468
|
10469
|
10470
|
10739
|
10740
|
10742
|
10743
|
10903
|
10920
|
10985
|
11299
|
11300
|
11489
|
11490
|
12268
|
12269
|
13193
|
13194
|
13195
|
13196
|
14122
|
14123
|
14124
|
14125
|
14996
|
15492
|
15493
|
15494
|
15495
|
15496
|
15534
|
15536
|
15537
|
15538
|
15539
|
15540
|
15541
|
16679
|
16680
|
16681
|
16682
|
16683
|
16684
|
16744
|
17283
|
17284
|
17285
|
17855
|
17856
|
17857
|
18298
|
18299
|
18300
|
18793
|
18794
|
18795
|
19368
|
19369
|
19370
|
19393
|
19395