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

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 137-142 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
137
('ImageLimit','5','','Limit images stored in the database by the Patron Card image manager to this number.','Integer'),
137
('ImageLimit','5','','Limit images stored in the database by the Patron Card image manager to this number.','Integer'),
138
('IncludeSeeFromInSearches','0','','Include see-from references in searches.','YesNo'),
138
('IncludeSeeFromInSearches','0','','Include see-from references in searches.','YesNo'),
139
('IndependentBranches','0',NULL,'If ON, increases security between libraries','YesNo'),
139
('IndependentBranches','0',NULL,'If ON, increases security between libraries','YesNo'),
140
('IndependentBranchesPatronModifications',0, NULL, 'Show only modification request for the logged in branch','YesNo'),
140
('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'),
141
('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'),
141
('INTRAdidyoumean',NULL,NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
142
('INTRAdidyoumean',NULL,NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
142
('IntranetBiblioDefaultView','normal','normal|marc|isbd|labeled_marc','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','Choice'),
143
('IntranetBiblioDefaultView','normal','normal|marc|isbd|labeled_marc','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','Choice'),
(-)a/installer/data/mysql/updatedatabase.pl (+10 lines)
Lines 7953-7958 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
7953
    SetVersion($DBversion);
7953
    SetVersion($DBversion);
7954
}
7954
}
7955
7955
7956
$DBversion = "3.15.00.XXX";
7957
if(CheckVersion($DBversion)) {
7958
    $dbh->do(q{
7959
        INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type)
7960
        VALUES ('IndependentBranchesPatronModifications',0,'Show only modification request for the logged in branch','','YesNo')
7961
    });
7962
    print "Upgrade to $DBversion done (Bug 10904 - would like to limit patron update request management by branch)\n";
7963
    SetVersion($DBversion);
7964
}
7965
7956
=head1 FUNCTIONS
7966
=head1 FUNCTIONS
7957
7967
7958
=head2 TableExists($table)
7968
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref (+7 lines)
Lines 70-75 Administration: Link Here
70
                  yes: Prevent
70
                  yes: Prevent
71
                  no: "Don't prevent"
71
                  no: "Don't prevent"
72
            - staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries.
72
            - staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries.
73
        -
74
            - pref: IndependentBranchesPatronModifications
75
              default: 0
76
              choices:
77
                  yes: Prevent
78
                  no: "Don't prevent"
79
            - staff (but not superlibrarians) from viewing and approving/denying patron modification requests for patrons belonging to other libraries.
73
    CAS Authentication:
80
    CAS Authentication:
74
        -
81
        -
75
            - pref: casAuthentication
82
            - pref: casAuthentication
(-)a/mainpage.pl (-3 / +5 lines)
Lines 50-58 $template->param( Link Here
50
    koha_news_count => $koha_news_count
50
    koha_news_count => $koha_news_count
51
);
51
);
52
52
53
my $branch = $flags->{'superlibrarian'}
53
my $branch =
54
  ? undef
54
  C4::Context->preference("IndependentBranchesPatronModifications")
55
  : C4::Context->userenv()->{'branch'};
55
  && !$flags->{'superlibrarian'}
56
  ? C4::Context->userenv()->{'branch'}
57
  : undef;
56
58
57
my $pendingcomments    = numberofreviews(0);
59
my $pendingcomments    = numberofreviews(0);
58
my $pendingtags        = get_count_by_tag_status(0);
60
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