Attachment 35531 Details for Bug 9303 – Bug 9303 [QA Followup 2] - Fix db update, move 'show' field to guarantor area

[patch] Bug 9303 [QA Followup 2] - Fix db update, move 'show' field to guarantor area

Bug-9303-QA-Followup-2---Fix-db-update-move-show-f.patch (text/plain), 5.20 KB, created by Kyle M Hall (khall) on 2015-01-26 13:29:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2015-01-26 13:29:44 UTC

Size: 5.20 KB

patch

obsolete

>From 6cc8971c741abdad5c583269f216de76737ef134 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Sun, 21 Dec 2014 23:51:06 -0500
>Subject: [PATCH] Bug 9303 [QA Followup 2] - Fix db update, move 'show' field to guarantor area
>
>---
> installer/data/mysql/updatedatabase.pl             |   19 +++++++-----
> .../prog/en/modules/members/memberentrygen.tt      |   30 ++++++++++----------
> 2 files changed, 26 insertions(+), 23 deletions(-)
>
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index be20188..9037d55 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -9673,22 +9673,25 @@ if ( CheckVersion($DBversion) ) {
> $DBversion = "3.19.00.XXX";
> if(CheckVersion($DBversion)) {
>     $dbh->do(q{
>-        ALTER TABLE borrowers ADD privacy_guarantor_checkouts BOOLEAN NOT NULL DEFAULT '0'
>+        ALTER TABLE borrowers ADD privacy_guarantor_checkouts BOOLEAN NOT NULL DEFAULT '0' AFTER privacy
>     });
>+
>     $dbh->do(q{
>-        ALTER TABLE deletedborrowers ADD privacy_guarantor_checkouts BOOLEAN NOT NULL DEFAULT '0'
>+        ALTER TABLE deletedborrowers ADD privacy_guarantor_checkouts BOOLEAN NOT NULL DEFAULT '0' AFTER privacy
>     });
>+
>     $dbh->do(q{
>         ALTER TABLE old_issues ADD issue_id INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST
>     });
>+
>     $dbh->do(q{
>-        ALTER TABLE issues ADD issue_id INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST
>+        ALTER TABLE old_issues CHANGE issue_id issue_id INT( 11 ) NOT NULL
>     });
>+
>     $dbh->do(q{
>-        ALTER TABLE issues
>-            DROP INDEX itemnumber_idx,
>-            ADD UNIQUE itemnumber_idx ( itemnumber )
>+        ALTER TABLE issues ADD issue_id INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST
>     });
>+
>     $dbh->do(qq{
>         UPDATE issues SET issue_id = issue_id + ( SELECT COUNT(*) FROM old_issues ) ORDER BY issue_id DESC
>     });
>@@ -9703,7 +9706,7 @@ if(CheckVersion($DBversion)) {
>     });
> 
>     $dbh->do(q{
>-        INSERT INTO systempreferences (variable, value, options, explanation, type )
>+        INSERT IGNORE INTO systempreferences (variable, value, options, explanation, type )
>         VALUES (
>             'AllowStaffToSetCheckoutsVisibilityForGuarantor',  '0', NULL,
>             'If enabled, library staff can set a patron''s checkouts to be visible to linked patrons from the opac.',  'YesNo'
>@@ -9711,7 +9714,7 @@ if(CheckVersion($DBversion)) {
>     });
> 
>     $dbh->do(q{
>-        INSERT INTO systempreferences (variable, value, options, explanation, type )
>+        INSERT IGNORE INTO systempreferences (variable, value, options, explanation, type )
>         VALUES (
>             'AllowPatronToSetCheckoutsVisibilityForGuarantor',  '0', NULL,
>             'If enabled, the patron can set checkouts to be visible to  his or her guarantor',  'YesNo'
>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 6a19f48..f57cead 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -442,6 +442,21 @@
>             [% END %]
>             <input id="guarantordelete" type="button" value="Delete" />
>         </li>
>+    [% IF guarantorid && Koha.Preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') %]
>+        <li>
>+            <label for="privacy_guarantor_checkouts">Show checkouts to guarantor</label>
>+            <select name="privacy_guarantor_checkouts" id="privacy_guarantor_checkouts">
>+                [% IF privacy_guarantor_checkouts %]
>+                    <option value="0">No</option>
>+                    <option value="1" selected>Yes</option>
>+                [% ELSE %]
>+                    <option value="0" selected>No</option>
>+                    <option value="1">Yes</option>
>+                [% END %]
>+            </select>
>+            <div class="hint">Allow guarantor of this patron to view this patron's checkouts from the OPAC</div>
>+        </li>
>+    [% END %]
>         </ol>
>     </fieldset>
> 
>@@ -1186,21 +1201,6 @@
> 			[% END %]
> 	  [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_password_mismatch ) %]<span class="required">Passwords do not match</span>[% END %]
> 		</li>
>-        [% IF guarantorid && Koha.Preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') %]
>-            <li>
>-                <label for="privacy_guarantor_checkouts">Show checkouts to guarantor</label>
>-                <select name="privacy_guarantor_checkouts" id="privacy_guarantor_checkouts">
>-                    [% IF privacy_guarantor_checkouts %]
>-                        <option value="0">No</option>
>-                        <option value="1" selected>Yes</option>
>-                    [% ELSE %]
>-                        <option value="0" selected>No</option>
>-                        <option value="1">Yes</option>
>-                    [% END %]
>-                </select>
>-                <div class="hint">Allow guarantor of this patron to view this patron's checkouts from the OPAC</div>
>-            </li>
>-        [% END %]
> 		</ol>
> 		</fieldset>
>         [% END # hide fieldset %][% END %]
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 9303: 22757 | 22770 | 22771 | 22772 | 22783 | 22789 | 22790 | 22809 | 22966 | 22967 | 22968 | 22974 | 22975 | 23086 | 23087 | 23088 | 23089 | 23090 | 23525 | 23526 | 23527 | 24009 | 24010 | 24011 | 24773 | 24774 | 24775 | 24776 | 25008 | 25584 | 25585 | 25586 | 27537 | 27538 | 27539 | 27540 | 27541 | 27542 | 27543 | 27698 | 27699 | 28153 | 28154 | 28155 | 28156 | 28157 | 28158 | 28159 | 28160 | 28161 | 28912 | 29171 | 29172 | 29215 | 29286 | 29287 | 29288 | 29289 | 29290 | 29299 | 29302 | 29303 | 29304 | 29932 | 29933 | 29934 | 29935 | 29936 | 29937 | 30287 | 30288 | 30289 | 30297 | 30298 | 30299 | 30300 | 32053 | 32054 | 32055 | 33049 | 34629 | 34630 | 34631 | 34632 | 34633 | 35519 | 35520 | 35521 | 35522 | 35523 | 35524 | 35525 | 35526 | 35527 | 35528 | 35529 | 35530 | 35531 | 35532 | 35678 | 35679 | 35680 | 35681 | 35682 | 35683 | 35684 | 35686 | 35687 | 35688 | 35689 | 35690 | 35691 | 35832 | 36287 | 36288 | 36289 | 37110 | 37111 | 37112 | 38264 | 38265 | 38266 | 38267 | 38328 | 38329 | 38330 | 38331 | 38446 | 38447 | 38448 | 38449 | 38450 | 38820 | 38821 | 38822 | 38823 | 38824 | 39042 | 39043 | 39044 | 39045 | 39046 | 39047 | 39048 | 39811 | 39817 | 39818 | 39819 | 39820 | 39821 | 39822 | 39823 | 44430 | 44431 | 44432 | 44433 | 44434 | 44435 | 44436 | 44511 | 44512 | 44513 | 44514 | 44515 | 44516 | 44517 | 46136 | 46137 | 46138 | 46139 | 46140 | 46141 | 46142