Attachment 27838 Details for Bug 7180 – Bug 7180: QA followup

[patch] Bug 7180: QA followup

Bug-7180-QA-followup.patch (text/plain), 7.10 KB, created by Jonathan Druart on 2014-05-01 07:21:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-05-01 07:21:26 UTC

Size: 7.10 KB

patch

obsolete

>From d5e1c438d693ac7b0f68f2d1ad127e5091b1c339 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Thu, 12 Sep 2013 11:44:25 +0200
>Subject: [PATCH] Bug 7180: QA followup
>
>- fix unit tests (use a transaction).
>- add 3 tabs on the page in order to be more understandable.
>- fix a warn in logs
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> acqui/addorderiso2709.pl                           |    1 +
> .../prog/en/modules/acqui/addorderiso2709.tt       |   42 ++++++++++++--------
> t/db_dependent/Budgets.t                           |    8 ++--
> 3 files changed, 31 insertions(+), 20 deletions(-)
>
>diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
>index 246de8d..e966a4c 100755
>--- a/acqui/addorderiso2709.pl
>+++ b/acqui/addorderiso2709.pl
>@@ -502,6 +502,7 @@ sub get_infos_syspref {
>     }
>     my $r;
>     for my $field_name ( @$field_list ) {
>+        next unless exists $yaml->{$field_name};
>         my @fields = split /\|/, $yaml->{$field_name};
>         for my $field ( @fields ) {
>             my ( $f, $sf ) = split /\$/, $field;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>index 4215262..3db819f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>@@ -71,11 +71,11 @@
>             if ( $(this).is(':checked') ) {
>                 $(container).addClass("selected");
>                 $(container).removeClass("unselected");
>-                $(container).find("ol").toggle();
>+                $(container).find("ol").toggle(true);
>             } else {
>                 $(container).addClass("unselected");
>                 $(container).removeClass("selected");
>-                $(container).find("ol").toggle();
>+                $(container).find("ol").toggle(false);
>             }
>         } );
> 
>@@ -113,12 +113,12 @@
> 
>             return disableUnchecked($(this));
>         });
>+        $('#tabs').tabs();
>     });
> 
>     function disableUnchecked(form){
>         $("div.biblio.unselected").each(function(){
>-            $(this).find('select').attr('disabled', 'disabled');
>-            $(this).find('input').attr('disabled', 'disabled');
>+            $(this).remove();
>         });
>         return 1;
>     }
>@@ -137,11 +137,17 @@
>                 <h1>Add orders from [% comments %]
>                     ([% file_name %] staged on [% upload_timestamp | $KohaDates with_hours => 1 %])
>                 </h1>
>-                <div>
>+                <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
>+                <div id="tabs" class="toptabs">
>+                  <ul>
>+                    <li><a href="#records_to_import">Select to import</a></li>
>+                    <li><a href="#items_info" class="items_info">Items information</a></li>
>+                    <li><a href="#accounting_details">Default accounting details</a></li>
>+                  </ul>
>+
>                   <div id="records_to_import">
>                     <span class="checkall"><a id="checkAll" href="#">Check All</a></span>
>                     <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span>
>-                    <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
>                         <input type="hidden" name="op" value="import_records"/>
>                         <input type="hidden" name="basketno" value="[% basketno %]" />
>                         <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
>@@ -153,7 +159,7 @@
>                         [% END %]
> 
>                         [% FOREACH biblio IN biblio_list %]
>-                        <fieldset class="biblio unselected rows">
>+                        <fieldset class="biblio unselected rows" style="float:none;">
>                           <legend>
>                             <label for="record_[% biblio.import_record_id %]" style="width:auto;">
>                               <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id %]" value="[% biblio.import_record_id %]" />
>@@ -221,12 +227,12 @@
>                         </fieldset>
>                         [% END %]
>                       </div>
>-                      <div id="import_all">
>-                        <h2>Import all</h2>
>-                        <p>Import all the lines in the basket with the following parameters:</p>
>+                      <div id="items_info">
>+                        <h2>Items information</h2>
>+                        <p>Import all the checked items in the basket with the following parameters:</p>
> 
>                         [% IF ( items ) %]
>-                        <fieldset class="rows">
>+                        <fieldset class="rows" style="float:none;">
>                             <legend>Item</legend>
>                             [% IF ( NoACQframework ) %]
>                                 <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>
>@@ -258,8 +264,9 @@
>                             [% END %] 
>                         </fieldset>
>                         [% END %] 
>-
>-                        <fieldset class="rows">
>+                      </div>
>+                      <div id="accounting_details">
>+                        <fieldset class="rows" style="float:none;">
>                             <legend>Accounting details</legend>
>                             <ol>
>                                 <li>
>@@ -342,11 +349,12 @@
>                                 </li>
>                             </ol>
>                         </fieldset>
>-                        <fieldset class="action">
>-                            <input type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>
>-                        </fieldset>
>+                      </div>
>+                      </div>
> 
>-                        </div>
>+                      <fieldset class="action">
>+                          <input type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>
>+                      </fieldset>
>                     </form>
>                 [% ELSE %]
>                 <div>
>diff --git a/t/db_dependent/Budgets.t b/t/db_dependent/Budgets.t
>index 54beddf..efb07ce 100755
>--- a/t/db_dependent/Budgets.t
>+++ b/t/db_dependent/Budgets.t
>@@ -3,16 +3,17 @@ use warnings;
> use Test::More tests => 22;
> 
> BEGIN {use_ok('C4::Budgets') }
>+use C4::Context;
> use C4::Dates;
> use C4::Context;
> 
> use YAML;
>-
>-my $dbh = C4::Context->dbh();
>+my $dbh = C4::Context->dbh;
> $dbh->{AutoCommit} = 0;
> $dbh->{RaiseError} = 1;
> 
>-$dbh->do('DELETE FROM aqbudgetperiods');
>+$dbh->do(q|DELETE FROM aqbudgetperiods|);
>+$dbh->do(q|DELETE FROM aqbudgets|);
> 
> #
> # Budget Periods :
>@@ -134,3 +135,4 @@ ok($budgets->[0]->{budget_name} lt $budgets->[1]->{budget_name}, 'default sort o
> ok($del_status=DelBudget($budget_id),
>     "DelBudget returned $del_status");
> 
>+$dbh->rollback;
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 7180: 6234 | 13019 | 15023 | 15048 | 15617 | 15677 | 15934 | 15935 | 16014 | 16505 | 16511 | 16544 | 16566 | 16613 | 19066 | 19067 | 19068 | 19316 | 19587 | 19588 | 19589 | 19590 | 19641 | 19645 | 20900 | 20901 | 20902 | 20903 | 20904 | 20926 | 20933 | 20934 | 20935 | 20978 | 20979 | 21004 | 21014 | 21017 | 21117 | 21462 | 21463 | 21464 | 21465 | 21466 | 21467 | 21468 | 21469 | 21470 | 21471 | 21472 | 21473 | 21474 | 21514 | 22546 | 22547 | 22548 | 22549 | 22550 | 22551 | 22552 | 22553 | 22554 | 22555 | 22556 | 22557 | 22558 | 22559 | 24052 | 24053 | 24054 | 24055 | 24056 | 24057 | 24058 | 24059 | 24060 | 24061 | 24062 | 24063 | 24064 | 24065 | 24636 | 24637 | 24638 | 24639 | 24640 | 24641 | 24642 | 24643 | 24644 | 24645 | 24646 | 24647 | 24648 | 24649 | 24708 | 24709 | 24710 | 24711 | 24712 | 24713 | 24714 | 24715 | 24716 | 24717 | 24718 | 24719 | 24720 | 24721 | 25908 | 26950 | 26951 | 26952 | 26953 | 26954 | 26955 | 26956 | 26957 | 26958 | 26959 | 26960 | 26961 | 26962 | 26963 | 26964 | 27128 | 27131 | 27136 | 27160 | 27325 | 27408 | 27409 | 27410 | 27411 | 27412 | 27413 | 27414 | 27415 | 27416 | 27417 | 27418 | 27419 | 27420 | 27421 | 27422 | 27423 | 27424 | 27451 | 27520 | 27561 | 27562 | 27563 | 27564 | 27565 | 27566 | 27567 | 27568 | 27569 | 27570 | 27571 | 27572 | 27573 | 27574 | 27575 | 27576 | 27577 | 27578 | 27829 | 27830 | 27831 | 27832 | 27833 | 27834 | 27835 | 27836 | 27837 | 27838 | 27839 | 27840 | 27841 | 27842 | 27843 | 27844 | 27845 | 27846 | 27847 | 27848 | 27849 | 27850 | 27851 | 27852 | 27853 | 27854 | 27855 | 27856 | 27857 | 27858 | 27859 | 27860 | 27861 | 27862 | 27863 | 27864 | 27865 | 27866