Attachment 59911 Details for Bug 18002 – Bug 18002 - Removed the Javascript preventing the display of currency and acquisition setup messages at the same time

[patch] Bug 18002 - Removed the Javascript preventing the display of currency and acquisition setup messages at the same time

Bug-18002---Removed-the-Javascript-preventing-the-.patch (text/plain), 3.28 KB, created by Alex Buckley on 2017-02-06 04:43:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Buckley

Created: 2017-02-06 04:43:39 UTC

Size: 3.28 KB

patch

obsolete

>From 4d4032cc081dd400ebdf98a5f64e8ded2ce9a23a Mon Sep 17 00:00:00 2001
>From: Alex Buckley <alexbuckley@catalyst.net.nz>
>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 ) %]
>-               <script type="text/javascript">
>-                   var showModal = 1;
>-               </script>
>-               <div id="acquisitionsModal" class="modal" style="z-index:1;display:none;background-color:#EDF4F6;padding:20px;width:60%;height:30%;    position:fixed;align:center;left:auto;top:auto;right:auto;bottom:auto;">
>+            <div id="acquisitionsModal" style="z-index:1;background-color:#EDF4F6;padding:20px;width:60%;height:30%;position:fixed;align:center;left:auto;top:auto;right:auto;bottom:10%;">
>                    <div class="acquisition-modal-content">
>                        Follow these links to set everything up ready to purchase orders:<br><br>
>                        <h2><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form" target="_blank" data-toggle="tooltip"  title="The budget is the overall amount of money avaliable for the institution over a period of time">1. Create a budget</a>
>@@ -135,10 +120,6 @@ $(document).ready(function() {
>         <div class="dialog alert">Your administrator must define a budget in Administration</div>
>         [% END %]
>     [% END %]
>-    <script type="text/javascript">
>-         var hideModal = 1;
>-    </script>
>-
> <div class="yui-g">
> <div class="yui-u first">
> <div id="acqui_acqui_home_order">
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18002: 59910 | 59911 | 59992 | 60676 | 60677 | 60678 | 60679 | 60680 | 60681 | 60682 | 60683 | 60684 | 60685 | 60686 | 60687 | 60688 | 61987 | 61988 | 63150 | 63151 | 63380 | 63456 | 64732 | 64746 | 64765 | 64947 | 66301 | 67649 | 67650 | 67651 | 68108 | 68109 | 68110