Attachment 25585 Details for Bug 9303 – Bug 9303 [QA Followup 4] - Syspref the feature for staff

[patch] Bug 9303 [QA Followup 4] - Syspref the feature for staff

Bug-9303-QA-Followup-4---Syspref-the-feature-for-s.patch (text/plain), 5.93 KB, created by Kyle M Hall (khall) on 2014-02-24 14:32:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2014-02-24 14:32:22 UTC

Size: 5.93 KB

patch

obsolete

>From ef34c2d7cbf2ed70cfaf9efcdd1d6de5c731d454 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Mon, 24 Feb 2014 09:31:21 -0500
>Subject: [PATCH] Bug 9303 [QA Followup 4] - Syspref the feature for staff
>
>---
> installer/data/mysql/sysprefs.sql                  |    1 +
> installer/data/mysql/updatedatabase.pl             |    8 +++++
> .../prog/en/modules/admin/preferences/patrons.pref |    6 ++++
> .../prog/en/modules/members/memberentrygen.tt      |   29 +++++++++++---------
> 4 files changed, 31 insertions(+), 13 deletions(-)
>
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index 2c45345..54b8a5e 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -11,6 +11,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('AgeRestrictionOverride','0',NULL,'Allow staff to check out an item with age restriction.','YesNo'),
> ('AllFinesNeedOverride','1','0','If on, staff will be asked to override every fine, even if it is below noissuescharge.','YesNo'),
> ('AllowAllMessageDeletion','0','','Allow any Library to delete any message','YesNo'),
>+('AllowStaffToSetRelativesCheckoutsVisibility','0',NULL,'If enabled, library staff can set a patron''s checkouts to be visible to linked patrons from the opac.',  'YesNo'),
> ('AllowFineOverride','0','0','If on, staff will be able to issue books to patrons with fines greater than noissuescharge.','YesNo'),
> ('AllowHoldDateInFuture','0','','If set a date field is displayed on the Hold screen of the Staff Interface, allowing the hold date to be set in the future.','YesNo'),
> ('AllowHoldPolicyOverride','0',NULL,'Allow staff to override hold policies when placing holds','YesNo'),
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 4b409a4..43537f3 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -8040,6 +8040,14 @@ if(CheckVersion($DBversion)) {
>         ALTER TABLE issues AUTO_INCREMENT = $max_issue_id
>     });
> 
>+    $dbh->do(q{
>+        INSERT INTO systempreferences (variable, value, options, explanation, type )
>+        VALUES (
>+            'AllowStaffToSetRelativesCheckoutsVisibility',  '0', NULL ,  
>+            'If enabled, library staff can set a patron''s checkouts to be visible to linked patrons from the opac.',  'YesNo'
>+        )
>+    });
>+
>     print "Upgrade to $DBversion done (Bug 9303 - relative's checkouts in the opac)\n";
>     SetVersion($DBversion);
> }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>index 74d14af..0c9ffc2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>@@ -139,3 +139,9 @@ Patrons:
>                yes: Do
>                no: "Don't"
>          - enable the ability to upload and attach arbitrary files to a borrower record.
>+     -
>+         - pref: AllowStaffToSetRelativesCheckoutsVisibility
>+           choices:
>+               yes: Allow
>+               no: "Don't allow"
>+         - staff to set the ability for a patron's checkouts to be viewed by linked patrons in the OPAC.
>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 9ccf828..30b74a7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -1,5 +1,6 @@
> [% IF ( opduplicate ) %][% SET focusAction = "clearDupe" %][% END %]
> [% USE KohaDates %]
>+[% USE Koha %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Patrons &rsaquo; 
> [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] [% IF ( categoryname ) %] [% categoryname %] patron[% ELSE %][% IF ( I ) %] Organization patron[% END %][% IF ( A ) %] Adult patron[% END %][% IF ( C ) %] Child patron[% END %][% IF ( P ) %] Professional patron[% END %][% IF ( S ) %] Staff patron[% END %][% END %][% UNLESS ( opadd ) %] [% surname %], [% firstname %][% END %]</title>
>@@ -1165,19 +1166,21 @@
> 			[% END %]
> 	  [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_password_mismatch ) %]<span class="required">Passwords do not match</span>[% END %]
> 		</li>
>-        <li>
>-            <label for="privacy_relative_checkouts">Show checkouts to relatives</label>
>-            <select name="privacy_relative_checkouts" id="privacy_relative_checkouts">
>-                [% IF privacy_relative_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 linked patron accounts to view this patron's checkouts from the OPAC</div>
>-        </li>
>+        [% IF Koha.Preference('AllowStaffToSetRelativesCheckoutsVisibility') %]
>+            <li>
>+                <label for="privacy_relative_checkouts">Show checkouts to relatives</label>
>+                <select name="privacy_relative_checkouts" id="privacy_relative_checkouts">
>+                    [% IF privacy_relative_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 linked patron accounts 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