From 72a818be61328f8d195e947728f863f5ce101c0c Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 22 Nov 2013 13:50:38 -0500 Subject: [PATCH] Bug 10904 [QA Followup] - would like to limit patron update request management by branch Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer --- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 10 ++++++++++ .../prog/en/modules/admin/preferences/admin.pref | 7 +++++++ mainpage.pl | 8 +++++--- members/members-update.pl | 7 ++++--- 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 88a1f5f..13c3b7b 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -160,6 +160,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('ImageLimit','5','','Limit images stored in the database by the Patron Card image manager to this number.','Integer'), ('IncludeSeeFromInSearches','0','','Include see-from references in searches.','YesNo'), ('IndependentBranches','0',NULL,'If ON, increases security between libraries','YesNo'), +('IndependentBranchesPatronModifications',0, NULL, 'Show only modification request for the logged in branch','YesNo'), ('OnSiteCheckouts','0','','Enable/Disable the on-site checkouts feature','YesNo'), ('OnSiteCheckoutsForce','0','','Enable/Disable the on-site for all cases (Even if a user is debarred, etc.)','YesNo'), ('InProcessingToShelvingCart','0','','If set, when any item with a location code of PROC is \'checked in\', it\'s location code will be changed to CART.','YesNo'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index caf4b4f..340ca6c 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -10868,6 +10868,16 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.21.00.XXX"; +if(CheckVersion($DBversion)) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) + VALUES ('IndependentBranchesPatronModifications',0,'Show only modification request for the logged in branch','','YesNo') + }); + print "Upgrade to $DBversion done (Bug 10904 - would like to limit patron update request management by branch)\n"; + SetVersion($DBversion); +} + # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref index 6b1d095..3e88260 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref @@ -87,6 +87,13 @@ Administration: yes: Prevent no: "Don't prevent" - staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries. + - + - pref: IndependentBranchesPatronModifications + default: 0 + choices: + yes: Prevent + no: "Don't prevent" + - staff (but not superlibrarians) from viewing and approving/denying patron modification requests for patrons belonging to other libraries. CAS Authentication: - - pref: casAuthentication diff --git a/mainpage.pl b/mainpage.pl index ccea240..d0635cb 100755 --- a/mainpage.pl +++ b/mainpage.pl @@ -55,9 +55,11 @@ $template->param( koha_news_count => $koha_news_count ); -my $branch = $flags->{'superlibrarian'} - ? undef - : C4::Context->userenv()->{'branch'}; +my $branch = + C4::Context->preference("IndependentBranchesPatronModifications") + && !$flags->{'superlibrarian'} + ? C4::Context->userenv()->{'branch'} + : undef; my $pendingcomments = numberofreviews(0); my $pendingtags = get_count_by_tag_status(0); diff --git a/members/members-update.pl b/members/members-update.pl index a3c1a9d..39e29ff 100755 --- a/members/members-update.pl +++ b/members/members-update.pl @@ -42,9 +42,10 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( ); my $branch = - $flags->{'superlibrarian'} - ? undef - : C4::Context->userenv()->{'branch'}; + C4::Context->preference("IndependentBranchesPatronModifications") + && !$flags->{'superlibrarian'} + ? C4::Context->userenv()->{'branch'} + : undef; my $pending_modifications = Koha::Borrower::Modifications->GetPendingModifications($branch); -- 1.7.2.5