From 4d4032cc081dd400ebdf98a5f64e8ded2ce9a23a Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Sun, 29 Jan 2017 12:51:41 +0000 Subject: [PATCH] Bug 18002 - Removed the Javascript preventing the display of currency and acquisition setup messages at the same time --- acqui/acqui-home.pl | 1 + .../prog/en/modules/acqui/acqui-home.tt | 21 +-------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl index fe53174..856558f 100755 --- a/acqui/acqui-home.pl +++ b/acqui/acqui-home.pl @@ -107,6 +107,7 @@ foreach my $budget ( @{$budget_arr} ) { push @budget_loop, $budget; } +warn \@budget_loop; $template->param( type => 'intranet', loop_budget => \@budget_loop, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index 57cda13..9143be1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -15,18 +15,6 @@ dt_overwrite_html_sorting_localeCompare(); $(document).ready(function() { - //Store element references for the modal box in variables - var modal = document.getElementById('acquisitionsModal'); - var span = document.getElementsByClassName("close")[0]; - - //If no budget has been created fade in the acquisitions modal informational box - if ( showModal == 1) { - $('#acquisitionsModal').fadeIn(1000); - } - if ( hideModal == 1) { - $('#acquisitionsModal').hide(); - } - var oTable = $("#accounts").dataTable($.extend(true, {}, dataTablesDefaults, { "fnDrawCallback": function ( oSettings ) { if ( oSettings.aiDisplay.length == 0 ) @@ -115,10 +103,7 @@ $(document).ready(function() { [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %] [% UNLESS ( loop_budget ) %] [% IF ( CAN_user_acquisition_period_manage ) %] - -