Bug 11897: (QA follow-up) Fixes for JS12

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Martin Renvoize 2018-10-05 14:43:41 +01:00 committed by Nick Clemens
parent b2ff7223b7
commit 513aa79a5b
2 changed files with 32 additions and 23 deletions

View File

@ -1,17 +1,12 @@
[% USE raw %]
[% USE Koha %]
[% USE Asset %]
[% USE Branches %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Catalog &rsaquo; Stock rotation details for [% biblio.title | html %]</title>
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'browser-strings.inc' %]
[% Asset.js("js/browser.js") | $raw %]
<script type="text/javascript">
//<![CDATA[
var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10));
browser.show();
//]]>
</script>
</head>
<body id="catalog_stockrotation" class="catalog">
[% USE KohaDates %]
@ -169,4 +164,13 @@
[% INCLUDE 'biblio-view-menu.inc' %]
</div>
</div>
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/browser.js") | $raw %]
<script type="text/javascript">
var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10));
browser.show();
</script>
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]

View File

@ -1,27 +1,13 @@
[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% USE Branches %]
[% USE KohaDates %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Stock rotation</title>
[% INCLUDE 'doc-head-close.inc' %]
[% Asset.css("css/datatables.css") | $raw %]
[% INCLUDE 'datatables.inc' %]
[% Asset.js("js/pages/stockrotation.js") | $raw %]
<script type="text/javascript">
//<![CDATA[
$(document).ready(function() {
$('#sr_manage_items').dataTable($.extend(true, {}, dataTablesDefaults, {
"autoWidth": false,
"aoColumnDefs": [
{ "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
{ "bSortable": true, "bSearchable": false, 'aTargets': [ 'NoSearch' ] }
],
"sPaginationType": "four_button"
}));
});
//]]>
</script>
</head>
<body id="tools_stockrotation" class="tools">
@ -508,4 +494,23 @@
</div>
</div>
</div>
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/tools-menu.js") | $raw %]
[% INCLUDE 'datatables.inc' %]
[% Asset.js("js/pages/stockrotation.js") | $raw %]
<script type="text/javascript">
$(document).ready(function() {
$('#sr_manage_items').dataTable($.extend(true, {}, dataTablesDefaults, {
"autoWidth": false,
"aoColumnDefs": [
{ "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
{ "bSortable": true, "bSearchable": false, 'aTargets': [ 'NoSearch' ] }
],
"sPaginationType": "four_button"
}));
});
</script>
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]