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

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 160-165 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
160
('ImageLimit','5','','Limit images stored in the database by the Patron Card image manager to this number.','Integer'),
160
('ImageLimit','5','','Limit images stored in the database by the Patron Card image manager to this number.','Integer'),
161
('IncludeSeeFromInSearches','0','','Include see-from references in searches.','YesNo'),
161
('IncludeSeeFromInSearches','0','','Include see-from references in searches.','YesNo'),
162
('IndependentBranches','0',NULL,'If ON, increases security between libraries','YesNo'),
162
('IndependentBranches','0',NULL,'If ON, increases security between libraries','YesNo'),
163
('IndependentBranchesPatronModifications',0, NULL, 'Show only modification request for the logged in branch','YesNo'),
163
('OnSiteCheckouts','0','','Enable/Disable the on-site checkouts feature','YesNo'),
164
('OnSiteCheckouts','0','','Enable/Disable the on-site checkouts feature','YesNo'),
164
('OnSiteCheckoutsForce','0','','Enable/Disable the on-site for all cases (Even if a user is debarred, etc.)','YesNo'),
165
('OnSiteCheckoutsForce','0','','Enable/Disable the on-site for all cases (Even if a user is debarred, etc.)','YesNo'),
165
('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'),
166
('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'),
(-)a/installer/data/mysql/updatedatabase.pl (+10 lines)
Lines 10868-10873 if ( CheckVersion($DBversion) ) { Link Here
10868
    SetVersion($DBversion);
10868
    SetVersion($DBversion);
10869
}
10869
}
10870
10870
10871
$DBversion = "3.21.00.XXX";
10872
if(CheckVersion($DBversion)) {
10873
    $dbh->do(q{
10874
        INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type)
10875
        VALUES ('IndependentBranchesPatronModifications',0,'Show only modification request for the logged in branch','','YesNo')
10876
    });
10877
    print "Upgrade to $DBversion done (Bug 10904 - would like to limit patron update request management by branch)\n";
10878
    SetVersion($DBversion);
10879
}
10880
10871
# DEVELOPER PROCESS, search for anything to execute in the db_update directory
10881
# DEVELOPER PROCESS, search for anything to execute in the db_update directory
10872
# SEE bug 13068
10882
# SEE bug 13068
10873
# if there is anything in the atomicupdate, read and execute it.
10883
# if there is anything in the atomicupdate, read and execute it.
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref (+7 lines)
Lines 87-92 Administration: Link Here
87
                  yes: Prevent
87
                  yes: Prevent
88
                  no: "Don't prevent"
88
                  no: "Don't prevent"
89
            - staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries.
89
            - staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries.
90
        -
91
            - pref: IndependentBranchesPatronModifications
92
              default: 0
93
              choices:
94
                  yes: Prevent
95
                  no: "Don't prevent"
96
            - staff (but not superlibrarians) from viewing and approving/denying patron modification requests for patrons belonging to other libraries.
90
    CAS Authentication:
97
    CAS Authentication:
91
        -
98
        -
92
            - pref: casAuthentication
99
            - pref: casAuthentication
(-)a/mainpage.pl (-3 / +5 lines)
Lines 55-63 $template->param( Link Here
55
    koha_news_count => $koha_news_count
55
    koha_news_count => $koha_news_count
56
);
56
);
57
57
58
my $branch = $flags->{'superlibrarian'}
58
my $branch =
59
  ? undef
59
  C4::Context->preference("IndependentBranchesPatronModifications")
60
  : C4::Context->userenv()->{'branch'};
60
  && !$flags->{'superlibrarian'}
61
  ? C4::Context->userenv()->{'branch'}
62
  : undef;
61
63
62
my $pendingcomments    = numberofreviews(0);
64
my $pendingcomments    = numberofreviews(0);
63
my $pendingtags        = get_count_by_tag_status(0);
65
my $pendingtags        = get_count_by_tag_status(0);
(-)a/members/members-update.pl (-4 / +4 lines)
Lines 42-50 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( Link Here
42
);
42
);
43
43
44
my $branch =
44
my $branch =
45
  $flags->{'superlibrarian'}
45
  C4::Context->preference("IndependentBranchesPatronModifications")
46
  ? undef
46
  && !$flags->{'superlibrarian'}
47
  : C4::Context->userenv()->{'branch'};
47
  ? C4::Context->userenv()->{'branch'}
48
  : undef;
48
49
49
my $pending_modifications =
50
my $pending_modifications =
50
  Koha::Borrower::Modifications->GetPendingModifications($branch);
51
  Koha::Borrower::Modifications->GetPendingModifications($branch);
51
- 

Return to bug 10904