Attachment 27520 Details for Bug 7180 – Bug 7180: Reset statistic values on reloading the page

[patch] Bug 7180: Reset statistic values on reloading the page

Bug-7180-Reset-statistic-values-on-reloading-the-p.patch (text/plain), 5.75 KB, created by Jonathan Druart on 2014-04-24 07:30:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-04-24 07:30:28 UTC

Size: 5.75 KB

patch

obsolete

>From 699cf22c0d000b718fca026011b6b7e04535f1d7 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Wed, 23 Apr 2014 09:56:26 +0200
>Subject: [PATCH] Bug 7180: Reset statistic values on reloading the page
>
>On the "Default accounting details", if a dropdown list was created for
>a statistic value, on reloading the page it still exist. It should not
>given the fund value is reset.
>
>The CGIsort variable is useless and can be remove: the dropdown list
>is generated using the ajax call.
>---
> acqui/addorderiso2709.pl                           |   31 -----------------
> .../prog/en/modules/acqui/addorderiso2709.tt       |   36 ++++----------------
> 2 files changed, 6 insertions(+), 61 deletions(-)
>
>diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
>index f3c124e..456e840 100755
>--- a/acqui/addorderiso2709.pl
>+++ b/acqui/addorderiso2709.pl
>@@ -311,37 +311,6 @@ foreach my $r ( @{$budgets_hierarchy} ) {
> }
> $template->param( budget_loop    => $budget_loop,);
> 
>-my $CGIsort1;
>-if ($budget) {    # its a mod ..
>-    if ( defined $budget->{'sort1_authcat'} ) {    # with custom  Asort* planning values
>-        $CGIsort1 = GetAuthvalueDropbox(  $budget->{'sort1_authcat'}, $data->{'sort1'} );
>-    }
>-} elsif ( scalar(@$budgets) ) {
>-} elsif ( scalar(@$budgets_hierarchy) ) {
>-    $CGIsort1 = GetAuthvalueDropbox( @$budgets_hierarchy[0]->{'sort1_authcat'}, '' );
>-}
>-# if CGIsort is successfully fetched, the use it
>-# else - failback to plain input-field
>-if ($CGIsort1) {
>-    $template->param( CGIsort1 => $CGIsort1 );
>-} else {
>-    $template->param( sort1 => $data->{'sort1'} );
>-}
>-
>-my $CGIsort2;
>-if ($budget) {
>-    if ( defined $budget->{'sort2_authcat'} ) {
>-        $CGIsort2 = GetAuthvalueDropbox(  $budget->{'sort2_authcat'}, $data->{'sort2'} );
>-    }
>-} elsif ( scalar(@$budgets_hierarchy) ) {
>-    $CGIsort2 = GetAuthvalueDropbox( @$budgets_hierarchy[0]->{sort2_authcat}, '' );
>-}
>-if ($CGIsort2) {
>-    $template->param( CGIsort2 => $CGIsort2 );
>-} else {
>-    $template->param( sort2 => $data->{'sort2'} );
>-}
>-
> output_html_with_http_headers $input, $cookie, $template->output;
> 
> 
>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 4a72396..e5a5641 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>@@ -70,6 +70,8 @@
>             $(this).parent().siblings('li').find('input[name="sort2"]').attr('name', 'all_sort2');
>         } );
> 
>+        $("select[name='all_budget_id']").change();
>+
>         $("#records_to_import fieldset.rows ol").hide();
>         $('input:checkbox[name="import_record_id"]').change(function(){
>             var container = $(this).parents("fieldset");
>@@ -321,38 +323,12 @@
>                                 </li>
>                                 <li>
>                                     <div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
>-                                    <label for="sort1">Statistic 1: </label>
>-                                    [% IF CGIsort1 %]
>-                                        <select id="all_sort1" size="1" name="all_sort1">
>-                                        [% FOREACH sort_opt IN CGIsort1 %]
>-                                            [% IF sort_opt.default %]
>-                                                <option value="[% sort_opt.id %]" selected="selected">[% sort_opt.label %]</option>
>-                                            [% ELSE %]
>-                                                <option value="[% sort_opt.id %]">[% sort_opt.label %]</option>
>-                                            [% END %]
>-                                        [% END %]
>-                                        </select>
>-                                    [% ELSE %]
>-                                        <input type="text" id="all_sort1" size="20" name="all_sort1" value="[% sort1 %]" />
>-                                    [% END %]
>+                                    <label for="all_sort1">Statistic 1: </label>
>+                                    <input type="text" id="all_sort1" size="20" name="all_sort1" value="" />
>                                 </li>
>                                 <li>
>-                                  <span id="sort2_zone">
>-                                    <label for="sort2">Statistic 2: </label>
>-                                    [% IF CGIsort2 %]
>-                                        <select id="all_sort2" size="1" name="all_sort1">
>-                                        [% FOREACH sort_opt IN CGIsort2 %]
>-                                            [% IF sort_opt.default %]
>-                                                <option value="[% sort_opt.id %]" selected="selected">[% sort_opt.label %]</option>
>-                                            [% ELSE %]
>-                                                <option value="[% sort_opt.id %]">[% sort_opt.label %]</option>
>-                                            [% END %]
>-                                        [% END %]
>-                                        </select>
>-                                    [% ELSE %]
>-                                         <input type="text" id="all_sort2" size="20" name="all_sort2" value="[% sort2 %]" />
>-                                    [% END %]
>-                                  </span>
>+                                    <label for="all_sort2">Statistic 2: </label>
>+                                    <input type="text" id="all_sort2" size="20" name="all_sort2" value="" />
>                                 </li>
>                             </ol>
>                         </fieldset>
>-- 
>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