Bugzilla – Attachment 107731 Details for
Bug 24201
Attach desk to intranet session
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24201: (QA follow-up) Remove setdesk variable and add desk selection script only on pages in need
Bug-24201-QA-follow-up-Remove-setdesk-variable-and.patch (text/plain), 2.84 KB, created by
Martin Renvoize (ashimema)
on 2020-08-04 10:30:40 UTC
(
hide
)
Description:
Bug 24201: (QA follow-up) Remove setdesk variable and add desk selection script only on pages in need
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2020-08-04 10:30:40 UTC
Size:
2.84 KB
patch
obsolete
>From 1fe6bfcfaf00648fea2acdf33c48a67f6ce78ea2 Mon Sep 17 00:00:00 2001 >From: Josef Moravec <josef.moravec@gmail.com> >Date: Mon, 3 Aug 2020 07:37:10 +0000 >Subject: [PATCH] Bug 24201: (QA follow-up) Remove setdesk variable and add > desk selection script only on pages in need > >Signed-off-by: Josef Moravec <josef.moravec@gmail.com> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../intranet-tmpl/prog/en/includes/js_includes.inc | 3 --- > koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 5 ++--- > .../intranet-tmpl/prog/en/modules/circ/set-library.tt | 11 ++++++++--- > 3 files changed, 10 insertions(+), 9 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc >index 32e78165ee..f56faebea8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc >@@ -25,9 +25,6 @@ > [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %] > <!-- koha core js --> > [% Asset.js("js/staff-global.js") | $raw %] >-[% IF setdesk %] >-[% Asset.js("js/desk_selection.js") | $raw %] >-[% END %] > > [% INCLUDE 'validator-strings.inc' %] > [% IF ( IntranetUserJS ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >index 2ae79935f4..b3650f8de2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >@@ -1,12 +1,10 @@ > [% USE raw %] >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% USE Desks %] > [% USE Categories %] > [% SET footerjs = 1 %] >-[% IF Desks.all %] >- [% SET setdesk = 1 %] >-[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › > [% IF ( nopermission ) %]Access denied[% END %] >@@ -137,6 +135,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >+ [% Asset.js("js/desk_selection.js") | $raw %] > <script type="text/javascript"> > $(document).ready( function() { > if ( document.location.hash ) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >index 8d115f8661..c4dbb13bd9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >@@ -1,9 +1,9 @@ >+[% USE raw %] >+[% USE Asset %] > [% USE Branches %] > [% USE Desks %] > [% USE Koha %] >-[% IF Desks.all %] >- [% SET setdesk = 1 %] >-[% END %] >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Set library</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -112,4 +112,9 @@ Updated:<ul> > </div> <!-- /.col-sm-12 --> > </div> <!-- /.row --> > >+ >+[% MACRO jsinclude BLOCK %] >+ [% Asset.js("js/desk_selection.js") | $raw %] >+[% END %] >+ > [% INCLUDE 'intranet-bottom.inc' %] >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 24201
:
96158
|
96164
|
96165
|
96166
|
101452
|
101564
|
101684
|
101697
|
101704
|
101705
|
101848
|
101865
|
101866
|
101877
|
101878
|
101879
|
101880
|
101881
|
101882
|
101883
|
103839
|
103840
|
105795
|
105869
|
105873
|
105874
|
105875
|
106576
|
107089
|
107090
|
107091
|
107092
|
107093
|
107094
|
107095
|
107096
|
107097
|
107667
|
107668
|
107669
|
107670
|
107671
|
107672
|
107673
|
107674
|
107675
|
107676
|
107677
|
107678
|
107679
|
107680
|
107728
|
107729
|
107730
| 107731 |
107732
|
107750
|
107751
|
107752
|
107815
|
107816
|
107817
|
107818
|
107951
|
107952
|
107967
|
107968
|
107980
|
107981