Bug 24201: (QA follow-up) Remove setdesk variable and add desk selection script only...

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

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 cb2ca00..1acf183 100644 (file)
--- 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 2ae7993..b3650f8 100644 (file)
--- 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 &rsaquo; 
     [% 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 c511a0b..1384a6d 100644 (file)
--- 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 &rsaquo; Circulation &rsaquo; 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' %]