Bugzilla – Attachment 45274 Details for
Bug 15049
Add warning about "No active currency" to Acquisitions start page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15049: (Signed off) Hide currency but preserv alert
Bug-15049-Signed-off-Hide-currency-but-preserv-ale.patch (text/plain), 2.94 KB, created by
Marc Véron
on 2015-12-01 15:32:24 UTC
(
hide
)
Description:
Bug 15049: (Signed off) Hide currency but preserv alert
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2015-12-01 15:32:24 UTC
Size:
2.94 KB
patch
obsolete
>From 0be019c35b90ce4fc891dab4724efd9b9dfb9bf0 Mon Sep 17 00:00:00 2001 >From: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >Date: Thu, 29 Oct 2015 09:13:26 -0300 >Subject: [PATCH] Bug 15049: (Signed off) Hide currency but preserv alert >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >This follow up hides currency, but the alert pops >if no currency is active. > >To test: >1) Apply the patch >2) Unset any active currency >3) Alert must show on Acquisitons home >4) Set a currency active, no currency display on Acqui home >5) Check that currency IS displayed on /cgi-bin/koha/admin/aqbudgets.pl >or /cgi-bin/koha/admin/aqbudgetperiods.pl > >Amended for better translation > >Currency does / does not display as described in test plan. >Signed-off-by: Marc Véron <veron@veron.ch> >--- > .../prog/en/includes/budgets-active-currency.inc | 15 ++++++++++++++- > .../intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 2 +- > 2 files changed, 15 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc >index 400bbb9..fbaa7e8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc >@@ -1 +1,14 @@ >-[% IF ( currency ) %]<p><b>Currency = [% currency %]</b></p>[% ELSE %]<div class="dialog alert"><h3>No active currency is defined</h3><p>[% IF CAN_user_parameters_parameters_remaining_permissions %]Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.[% ELSE %]Your administrator must specify an active currency.[% END %]</p></div>[% END %] >+[% IF ( currency ) %] >+ [% IF ( not hide ) %] >+ <p><b>Currency = [% currency %]</b></p> >+ [% END %] >+[% ELSE %] >+ <div class="dialog alert"> >+ <h3>No active currency is defined</h3> >+ [% IF CAN_user_parameters_parameters_remaining_permissions %] >+ <p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p> >+ [% ELSE %] >+ <p>Your administrator must specify an active currency.</p> >+ [% END %] >+ </div> >+[% END %] >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 6b521aa..ab06267 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 >@@ -98,7 +98,7 @@ $(document).ready(function() { > [% INCLUDE 'acquisitions-toolbar.inc' %] > > <h1>Acquisitions</h1> >- [% INCLUDE 'budgets-active-currency.inc' %] >+ [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %] > [% UNLESS ( loop_budget ) %] > [% IF ( CAN_user_acquisition_period_manage ) %] > <div class="dialog alert">You must <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget</a> in Administration</div> >-- >1.7.10.4
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 15049
:
43744
|
44017
|
44070
|
44071
|
44076
|
44148
|
44152
|
45274
|
45778
|
45779
|
45840
|
45995
|
45996
|
45997
|
45998