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

(-)a/C4/Members.pm (-4 / +1 lines)
Lines 252-261 sub Search { Link Here
252
		}
252
		}
253
    }
253
    }
254
254
255
    # $showallbranches was not used at the time SearchMember() was mainstreamed into Search().
255
    if ( C4::Context->preference("IndependantBranches") && C4::Context->preference("IndependantBranchesCirculation") ) {
256
    # Mentioning for the reference
257
258
    if ( C4::Context->preference("IndependantBranches") ) { # && !$showallbranches){
259
        if ( my $userenv = C4::Context->userenv ) {
256
        if ( my $userenv = C4::Context->userenv ) {
260
            my $branch =  $userenv->{'branch'};
257
            my $branch =  $userenv->{'branch'};
261
            if ( ($userenv->{flags} % 2 !=1) &&
258
            if ( ($userenv->{flags} % 2 !=1) &&
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 408-410 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
408
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');
408
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');
409
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');
409
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');
410
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserJS', '', NULL, 'Define custom javascript for inclusion in the SCO module', 'free');
410
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserJS', '', NULL, 'Define custom javascript for inclusion in the SCO module', 'free');
411
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');
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 6347-6352 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
6347
    SetVersion($DBversion);
6347
    SetVersion($DBversion);
6348
}
6348
}
6349
6349
6350
$DBversion ="3.11.00.XXX";
6351
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6352
    $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')");
6353
    print "Upgrade to $DBversion done (Add system preference IndependantBranchesCirculation)\n";
6354
    SetVersion($DBversion);
6355
}
6356
6350
=head1 FUNCTIONS
6357
=head1 FUNCTIONS
6351
6358
6352
=head2 TableExists($table)
6359
=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: IndependantBranchesCirculation
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