View | Details | Raw Unified | Return to bug 8839
Collapse All | Expand All

(-)a/C4/Members.pm (-4 / +1 lines)
Lines 250-259 sub Search { Link Here
250
		}
250
		}
251
    }
251
    }
252
252
253
    # $showallbranches was not used at the time SearchMember() was mainstreamed into Search().
253
    if ( C4::Context->preference("IndependantBranches") && C4::Context->preference("IndependantBranchesPreventIssuing") ) {
254
    # Mentioning for the reference
255
256
    if ( C4::Context->preference("IndependantBranches") ) { # && !$showallbranches){
257
        if ( my $userenv = C4::Context->userenv ) {
254
        if ( my $userenv = C4::Context->userenv ) {
258
            my $branch =  $userenv->{'branch'};
255
            my $branch =  $userenv->{'branch'};
259
            if ( ($userenv->{flags} % 2 !=1) &&
256
            if ( ($userenv->{flags} % 2 !=1) &&
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 383-385 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
383
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowLibrariesPulldownMobile','1','Show the libraries pulldown on the mobile version of the OPAC.',NULL,'YesNo');
383
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowLibrariesPulldownMobile','1','Show the libraries pulldown on the mobile version of the OPAC.',NULL,'YesNo');
384
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowFiltersPulldownMobile','1','Show the search filters pulldown on the mobile version of the OPAC.',NULL,'YesNo');
384
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowFiltersPulldownMobile','1','Show the search filters pulldown on the mobile version of the OPAC.',NULL,'YesNo');
385
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('AuthDisplayHierarchy','0','Display authority hierarchies','','YesNo');
385
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('AuthDisplayHierarchy','0','Display authority hierarchies','','YesNo');
386
INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('IndependantBranchesPreventIssuing', '1', NULL, 'If enabled, and IndependantBranches is also enabled, this preference will prevent a librarian from issuing items to another libraries patrons.', 'YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (-1 / +7 lines)
Lines 5973-5979 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
5973
    SetVersion($DBversion);
5973
    SetVersion($DBversion);
5974
}
5974
}
5975
5975
5976
5977
$DBversion = "3.09.00.057";
5976
$DBversion = "3.09.00.057";
5978
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5977
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5979
    $dbh->do("ALTER TABLE aqbasket ADD deliveryplace VARCHAR(10) default NULL AFTER basketgroupid;");
5978
    $dbh->do("ALTER TABLE aqbasket ADD deliveryplace VARCHAR(10) default NULL AFTER basketgroupid;");
Lines 5982-5987 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
5982
    SetVersion($DBversion);
5981
    SetVersion($DBversion);
5983
}
5982
}
5984
5983
5984
$DBversion ="3.09.00.XXX";
5985
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5986
    $dbh->do("INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('IndependantBranchesPreventIssuing', '1', NULL, 'If enabled, and IndependantBranches is also enabled, this preference will prevent a librarian from issuing items to another libraries patrons.', 'YesNo')");
5987
    print "Upgrade to $DBversion done (Add system preference IndependantBranchesPreventIssuing)\n";
5988
    SetVersion($DBversion);
5989
}
5990
5985
=head1 FUNCTIONS
5991
=head1 FUNCTIONS
5986
5992
5987
=head2 TableExists($table)
5993
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref (-1 / +7 lines)
Lines 77-82 Administration: Link Here
77
                  yes: Prevent
77
                  yes: Prevent
78
                  no: "Don't prevent"
78
                  no: "Don't prevent"
79
            - staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries.
79
            - staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries.
80
        -
81
            - pref: IndependantBranchesPreventIssuing
82
              default: 0
83
              choices:
84
                  yes: Prevent
85
                  no: "Don't prevent"
86
            - 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".
80
    CAS Authentication:
87
    CAS Authentication:
81
        -
88
        -
82
            - pref: casAuthentication
89
            - pref: casAuthentication
83
- 

Return to bug 8839