From 088eddc63453ef99a7463f9361ae6cdbca0d89f5 Mon Sep 17 00:00:00 2001 From: Julian Maurice <julian.maurice@biblibre.com> Date: Tue, 23 Jul 2013 09:43:02 +0200 Subject: [PATCH] Bug 8296: Don't fill text field automatically + minor fixes: * Add bug number to updatedatabase * Fix colspan in serials-edit.tt --- installer/data/mysql/updatedatabase.pl | 2 +- .../intranet-tmpl/prog/en/modules/serials/serials-edit.tt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index bca5537..778ea12 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8568,7 +8568,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { AFTER publisheddate "); - print "Upgrade to $DBversion done (Add serial.publisheddatetext)\n"; + print "Upgrade to $DBversion done (Bug 8296: Add serial.publisheddatetext)\n"; SetVersion($DBversion); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt index c75731c..ac5272e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -164,7 +164,7 @@ $(document).ready(function() { <input type="text" name="publisheddate" value="[% serialslis.publisheddate %]" size="10" maxlength="15" /> </td> <td> - <input type="text" name="publisheddatetext" value="[% serialslis.publisheddatetext || serialslis.publisheddate %]" size="10" maxlength="100" /> + <input type="text" name="publisheddatetext" value="[% serialslis.publisheddatetext %]" size="10" maxlength="100" /> </td> <td> <input type="text" id="expecteddate" name="planneddate" value="[% serialslis.planneddate %]" size="10" maxlength="15" /> @@ -248,7 +248,7 @@ $(document).ready(function() { [% UNLESS ( serialslis.subscriptionexpired ) %] [% IF ( serialslis.serialsadditems ) %] <tr> - <td colspan="5"> + <td colspan="6"> <a id="label[% serialslis.subscriptionid %][% serialslis.serialid %]" style="color: grey; font-size: 80%; cursor: pointer;" onclick="unHideItems('items[% serialslis.subscriptionid %][% serialslis.serialid %]','label[% serialslis.subscriptionid %][% serialslis.serialid %]', '[% serialslis.serialid %]');setStatus([% serialslis.serialid %]);"> Click to add item</a> <fieldset class="rows" style="display:none;" id="items[% serialslis.subscriptionid %][% serialslis.serialid %]"> @@ -309,7 +309,7 @@ $(document).ready(function() { <input type="text" name="publisheddate" value="[% newserialloo.publisheddate %]" size="10" maxlength="15" /> </td> <td> - <input type="text" name="publisheddatetext" value="[% newserialloo.publisheddatetext || newserialloo.publisheddate %]" size="10" maxlength="100" /> + <input type="text" name="publisheddatetext" value="[% newserialloo.publisheddatetext %]" size="10" maxlength="100" /> </td> <td> <input type="text" name="planneddate" id="supexpecteddate" value="[% newserialloo.planneddate %]" size="10" maxlength="15" /> @@ -383,7 +383,7 @@ $(document).ready(function() { </tr> [% IF ( newserialloo.serialsadditems ) %] <tr> - <td colspan="5"> + <td colspan="6"> <a id="label[% newserialloo.subscriptionid %][% newserialloo.serialid %]" style="color: grey; font-size: 80%; cursor: pointer;" onclick="unHideItems('items[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]', '[% newserialloo.serialid %]')"> Click to add item</a> <fieldset class="rows" style="display:none;" id="items[% newserialloo.subscriptionid %][% newserialloo.serialid %]"> -- 1.7.10.4