From 7556b2c911c2d633c5264b903116fcc1c65eeeee Mon Sep 17 00:00:00 2001 From: mehdi Date: Fri, 8 Jul 2016 13:42:02 -0400 Subject: [PATCH] Bug 11879 - QA Follow-up updatedatabase.pl no longer adds column primary_contact_method to table borrowers Fixed the incorrectly capitalized label and added the ':' in front of it(opac and intranet). Changed mobile phone to other phone in intranet and added a switch case in moremember.tt to display the correct label. --- installer/data/mysql/updatedatabase.pl | 6 ------ .../prog/en/modules/members/memberentrygen.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 15 ++++++++++++++- .../opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index ab4916a..994a5d7 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8724,12 +8724,6 @@ if ( CheckVersion($DBversion) ) { print "Upgrade to $DBversion done (Bug 10402: Move bookseller contacts to separate table)\n"; SetVersion($DBversion); } -$DBversion = "XXX"; -if ( CheckVersion($DBversion) ) { - $dbh->do("ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL;"); - print "Upgrade to $DBversion done (Bug 11879: Add a new borrower field : main contact method)\n"; - SetVersion($DBversion); -} $DBversion = "3.17.00.017"; if ( CheckVersion($DBversion) ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 7ee21e6..0c14b3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -568,7 +568,7 @@ $(document).ready(function() { [% END %]
  • - + [% FOREACH contactprincipalloo IN contactprincipalloop %] -- 1.9.1