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

(-)a/Koha/Template/Plugin/Branches.pm (-2 / +2 lines)
Lines 157-163 sub GetBranchSpecificJS { Link Here
157
    my ($self, $branchcode) = @_;
157
    my ($self, $branchcode) = @_;
158
158
159
    return q{} unless defined $branchcode;
159
    return q{} unless defined $branchcode;
160
    
160
161
    my $library = Koha::Libraries->find($branchcode);
161
    my $library = Koha::Libraries->find($branchcode);
162
    my $userjs = $library ? $library->userjs : q{};
162
    my $userjs = $library ? $library->userjs : q{};
163
163
Lines 168-174 sub GetBranchSpecificCSS { Link Here
168
    my ($self, $branchcode) = @_;
168
    my ($self, $branchcode) = @_;
169
169
170
    return q{} unless defined $branchcode;
170
    return q{} unless defined $branchcode;
171
    
171
172
    my $library = Koha::Libraries->find($branchcode);
172
    my $library = Koha::Libraries->find($branchcode);
173
    my $usercss = $library ? $library->usercss : q{};
173
    my $usercss = $library ? $library->usercss : q{};
174
174
(-)a/installer/data/mysql/atomicupdate/bug_32721-add_branch_level_js.pl (-3 / +3 lines)
Lines 4-20 return { Link Here
4
    bug_number => "32721",
4
    bug_number => "32721",
5
    description => "Allow branch specific javascript and css to be injected into the OPAC depending on a branchcode",
5
    description => "Allow branch specific javascript and css to be injected into the OPAC depending on a branchcode",
6
    up => sub {
6
    up => sub {
7
        my ($args) = @_; 
7
        my ($args) = @_;
8
        my ($dbh, $out) = @$args{qw(dbh out)};
8
        my ($dbh, $out) = @$args{qw(dbh out)};
9
9
10
        if( !column_exists( 'branches', 'userjs' ) ) { 
10
        if( !column_exists( 'branches', 'userjs' ) ) {
11
          $dbh->do(q{
11
          $dbh->do(q{
12
              ALTER TABLE branches ADD COLUMN `userjs` longtext DEFAULT NULL AFTER `public`
12
              ALTER TABLE branches ADD COLUMN `userjs` longtext DEFAULT NULL AFTER `public`
13
          });
13
          });
14
14
15
          say $out "Added column 'branches.userjs'";
15
          say $out "Added column 'branches.userjs'";
16
        }
16
        }
17
        if( !column_exists( 'branches', 'usercss' ) ) { 
17
        if( !column_exists( 'branches', 'usercss' ) ) {
18
          $dbh->do(q{
18
          $dbh->do(q{
19
              ALTER TABLE branches ADD COLUMN `usercss` longtext DEFAULT NULL AFTER `userjs`
19
              ALTER TABLE branches ADD COLUMN `usercss` longtext DEFAULT NULL AFTER `userjs`
20
          });
20
          });
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt (-2 / +2 lines)
Lines 294-300 Libraries › Administration › Koha Link Here
294
                    <label for="UserJS">UserJS: </label>
294
                    <label for="UserJS">UserJS: </label>
295
                    <div style="display:flex; flex-direction:column;">
295
                    <div style="display:flex; flex-direction:column;">
296
                        <a class="expand-textarea" id="expand_userjs" data-target="userjs" data-syntax="javascript" href="#">Click to edit</a>
296
                        <a class="expand-textarea" id="expand_userjs" data-target="userjs" data-syntax="javascript" href="#">Click to edit</a>
297
                        <textarea style="display:none" name="userjs" id="userjs" class="codemirror" rows="10" cols="40">[% library.userjs %]</textarea>
297
                        <textarea style="display:none" name="userjs" id="userjs" class="codemirror" rows="10" cols="40">[% library.userjs | html %]</textarea>
298
                        <a class="collapse-textarea" id="collapse_userjs" data-target="userjs" data-syntax="javascript" style="display:none" href="#">Click to collapse</br></a>
298
                        <a class="collapse-textarea" id="collapse_userjs" data-target="userjs" data-syntax="javascript" style="display:none" href="#">Click to collapse</br></a>
299
                    </div>
299
                    </div>
300
                </li>
300
                </li>
Lines 302-308 Libraries &rsaquo; Administration &rsaquo; Koha Link Here
302
                    <label for="UserCSS">UserCSS: </label>
302
                    <label for="UserCSS">UserCSS: </label>
303
                    <div style="display:flex; flex-direction:column;">
303
                    <div style="display:flex; flex-direction:column;">
304
                        <a class="expand-textarea" id="expand_usercss" data-target="usercss" data-syntax="css" href="#">Click to edit</a>
304
                        <a class="expand-textarea" id="expand_usercss" data-target="usercss" data-syntax="css" href="#">Click to edit</a>
305
                        <textarea style="display:none" name="usercss" id="usercss" class="" rows="10" cols="40">[% library.usercss %]</textarea>
305
                        <textarea style="display:none" name="usercss" id="usercss" class="" rows="10" cols="40">[% library.usercss | html %]</textarea>
306
                        <a class="collapse-textarea" id="collapse_usercss" data-target="usercss" data-syntax="css" style="display:none" href="#">Click to collapse</br></a>
306
                        <a class="collapse-textarea" id="collapse_usercss" data-target="usercss" data-syntax="css" style="display:none" href="#">Click to collapse</br></a>
307
                    </div>
307
                    </div>
308
                </li>
308
                </li>
(-)a/t/db_dependent/Template/Plugin/Branches.t (-2 / +1 lines)
Lines 218-224 subtest 'pickup_locations() tests' => sub { Link Here
218
    $schema->storage->txn_rollback;
218
    $schema->storage->txn_rollback;
219
};
219
};
220
220
221
subtest 'branch specfic js and css' => sub {
221
subtest 'branch specific js and css' => sub {
222
222
223
    plan tests => 2;
223
    plan tests => 2;
224
224
225
- 

Return to bug 32721