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

(-)a/installer/data/mysql/mandatory/sysprefs.sql (+1 lines)
Lines 266-271 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
266
('IndependentBranches','0',NULL,'If ON, increases security between libraries','YesNo'),
266
('IndependentBranches','0',NULL,'If ON, increases security between libraries','YesNo'),
267
('IndependentBranchesPatronModifications','0', NULL, 'Show only modification request for the logged in branch','YesNo'),
267
('IndependentBranchesPatronModifications','0', NULL, 'Show only modification request for the logged in branch','YesNo'),
268
('IndependentBranchesTransfers','0', NULL, 'Allow non-superlibrarians to transfer items between libraries','YesNo'),
268
('IndependentBranchesTransfers','0', NULL, 'Allow non-superlibrarians to transfer items between libraries','YesNo'),
269
('IndependentBranchesLoggedInLibrary','0', NULL, 'Allow only superlibrarians the ability to set or change their logged in location','YesNo'),
269
('IntranetCatalogSearchPulldown','0', NULL, 'Show a search field pulldown for \"Search the catalog\" boxes','YesNo'),
270
('IntranetCatalogSearchPulldown','0', NULL, 'Show a search field pulldown for \"Search the catalog\" boxes','YesNo'),
270
('RecordedBooksClientSecret','','30','Client key for RecordedBooks integration','Free'),
271
('RecordedBooksClientSecret','','30','Client key for RecordedBooks integration','Free'),
271
('RecordedBooksDomain','','','RecordedBooks domain','Free'),
272
('RecordedBooksDomain','','','RecordedBooks domain','Free'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc (-1 / +1 lines)
Lines 15-21 Link Here
15
            [% IF !Koha.Preference('IndependentBranchesTransfers') || CAN_user_superlibrarian %]
15
            [% IF !Koha.Preference('IndependentBranchesTransfers') || CAN_user_superlibrarian %]
16
                <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
16
                <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
17
            [% END %]
17
            [% END %]
18
            [% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
18
            [% IF !( Koha.Preference('IndependentBranchesLoggedInLibrary') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
19
                [% IF Koha.Preference('UseCirculationDesks') %]
19
                [% IF Koha.Preference('UseCirculationDesks') %]
20
                <li><a href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a></li>
20
                <li><a href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a></li>
21
                [% ELSE %]
21
                [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (-1 / +1 lines)
Lines 149-155 Link Here
149
                        </li>
149
                        </li>
150
                    [% END %]
150
                    [% END %]
151
151
152
                    [% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
152
                    [% IF !( Koha.Preference('IndependentBranchesLoggedInLibrary') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
153
                    <li role="separator" class="loggedin-menu-label divider"></li>
153
                    <li role="separator" class="loggedin-menu-label divider"></li>
154
                    <li>
154
                    <li>
155
                        [% IF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %]
155
                        [% IF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref (+7 lines)
Lines 123-128 Administration: Link Here
123
              choices:
123
              choices:
124
                  1: "Yes"
124
                  1: "Yes"
125
                  0: "No"
125
                  0: "No"
126
        -
127
            - "Prevent staff (but not superlibrarians) from setting or changing their logged in location:"
128
            - pref: IndependentBranchesLoggedInLibrary
129
              default: 0
130
              choices:
131
                  1: "Yes"
132
                  0: "No"
126
        -
133
        -
127
            - "Prevent staff (but not superlibrarians) from transfering items to other libraries: "
134
            - "Prevent staff (but not superlibrarians) from transfering items to other libraries: "
128
            - pref: IndependentBranchesTransfers
135
            - pref: IndependentBranchesTransfers
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt (-1 / +1 lines)
Lines 75-81 Link Here
75
    <input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" autocomplete="off" />
75
    <input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" autocomplete="off" />
76
    </p>
76
    </p>
77
77
78
    [% UNLESS IndependentBranches %]
78
    [% UNLESS Koha.Preference('IndependentBranchesLoggedInLibrary') %]
79
        <p>
79
        <p>
80
            <label for="branch">Library:</label>
80
            <label for="branch">Library:</label>
81
            <select name="branch" id="branch" class="input" tabindex="3">
81
            <select name="branch" id="branch" class="input" tabindex="3">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (-2 / +1 lines)
Lines 39-45 Link Here
39
                    <li>
39
                    <li>
40
                        <a class="circ-button" href="/cgi-bin/koha/circ/renew.pl"><i class="fa fa-retweet"></i> Renew</a>
40
                        <a class="circ-button" href="/cgi-bin/koha/circ/renew.pl"><i class="fa fa-retweet"></i> Renew</a>
41
                    </li>
41
                    </li>
42
                    [% UNLESS IndependentBranches %]
42
                    [% IF !Koha.Preference('IndependentBranchesLoggedInLibrary') || CAN_user_superlibrarian %]
43
                        <li>
43
                        <li>
44
                            [% IF Koha.Preference('UseCirculationDesks') %]
44
                            [% IF Koha.Preference('UseCirculationDesks') %]
45
                            <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library and desk</a>
45
                            <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library and desk</a>
Lines 101-107 Link Here
101
                [% END %]
101
                [% END %]
102
102
103
                <h3>Transfers</h3>
103
                <h3>Transfers</h3>
104
105
                <ul class="buttons-list">
104
                <ul class="buttons-list">
106
                    [% IF !Koha.Preference('IndependentBranchesTransfers') || CAN_user_superlibrarian %]
105
                    [% IF !Koha.Preference('IndependentBranchesTransfers') || CAN_user_superlibrarian %]
107
                        <li>
106
                        <li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt (-2 / +1 lines)
Lines 79-85 Updated:<ul> Link Here
79
[% ELSE %]
79
[% ELSE %]
80
80
81
<form method="post" action="set-library.pl">
81
<form method="post" action="set-library.pl">
82
[% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
82
[% IF !( Koha.Preference('IndependentBranchesLoggedInLibrary') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
83
<fieldset class="rows">
83
<fieldset class="rows">
84
    <legend>Set library</legend>
84
    <legend>Set library</legend>
85
    <ol>
85
    <ol>
86
- 

Return to bug 29887