Bugzilla – Attachment 14865 Details for
Bug 8839
Independant Branches - Checkout to patron belonging to another branch
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8839 - Independant Branches - Checkout to patron belonging to another branch
Bug-8839---Independant-Branches---Checkout-to-patr.patch (text/plain), 4.43 KB, created by
Kyle M Hall
on 2013-01-25 15:38:49 UTC
(
hide
)
Description:
Bug 8839 - Independant Branches - Checkout to patron belonging to another branch
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2013-01-25 15:38:49 UTC
Size:
4.43 KB
patch
obsolete
>From 36c63bac530dd4cc5d50e6925ab4d8baee1b90fc Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Thu, 27 Sep 2012 11:27:50 -0400 >Subject: [PATCH] Bug 8839 - Independant Branches - Checkout to patron belonging to another branch > >Adds the new system preference IndependantBranchesCirculation to control >whether IndependantBranches stops one branch from viewing the patron record >or issuing items to a patron from a different library. >--- > C4/Members.pm | 5 +---- > installer/data/mysql/sysprefs.sql | 1 + > installer/data/mysql/updatedatabase.pl | 7 +++++++ > .../prog/en/modules/admin/preferences/admin.pref | 7 +++++++ > 4 files changed, 16 insertions(+), 4 deletions(-) > >diff --git a/C4/Members.pm b/C4/Members.pm >index f1136c2..fa40c57 100644 >--- a/C4/Members.pm >+++ b/C4/Members.pm >@@ -252,10 +252,7 @@ sub Search { > } > } > >- # $showallbranches was not used at the time SearchMember() was mainstreamed into Search(). >- # Mentioning for the reference >- >- if ( C4::Context->preference("IndependantBranches") ) { # && !$showallbranches){ >+ if ( C4::Context->preference("IndependantBranches") && C4::Context->preference("IndependantBranchesCirculation") ) { > if ( my $userenv = C4::Context->userenv ) { > my $branch = $userenv->{'branch'}; > if ( ($userenv->{flags} % 2 !=1) && >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 7e9f43d..0b4f11f 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -408,3 +408,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('NotesBlacklist','','List of notes fields that should not appear in the title notes/description separator of details',NULL,'free'); > INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserCSS', '', NULL, 'Add CSS to be included in the SCO module in an embedded <style> tag.', 'free'); > INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserJS', '', NULL, 'Define custom javascript for inclusion in the SCO module', 'free'); >+INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('IndependantBranchesCirculation', '1', NULL, 'If enabled, and IndependantBranches is also enabled, this preference will prevent a librarian from issuing items to another libraries patrons.', 'YesNo'); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index bd0fc99..da52b12 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -6347,6 +6347,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { > SetVersion($DBversion); > } > >+$DBversion ="3.11.00.XXX"; >+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { >+ $dbh->do("INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('IndependantBranchesCirculation', '1', NULL, 'If enabled, and IndependantBranches is also enabled, this preference will prevent a librarian from issuing items to another libraries patrons.', 'YesNo')"); >+ print "Upgrade to $DBversion done (Add system preference IndependantBranchesCirculation)\n"; >+ SetVersion($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >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 4e907e1..82b19fb 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 >@@ -77,6 +77,13 @@ Administration: > yes: Prevent > no: "Don't prevent" > - staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries. >+ - >+ - pref: IndependantBranchesCirculation >+ default: 0 >+ choices: >+ yes: Prevent >+ no: "Don't prevent" >+ - staff (but not superlibrarians) from viewing and issuing items to patrons belonging to other libraries. This setting is ignored unless IndependantBranches is set to "Prevent". > CAS Authentication: > - > - pref: casAuthentication >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8839
:
12562
|
12748
| 14865