Bug 7180: make neworderempty code use getAuthValueDropbox.

The js function fetchSortDropbox has been deleted in previous patch.
The new function is getAuthValueDropbox.

Test plan:
- link authorized values to some funds
- open an existing order and verify value are correctly filled in the
  sort1 and sort2 values
- create a new order and verify behavior is the same as before

Note: This patch generates 2 ajax queries (max) if the budget is linked
to 2 av categories for sort1 and sort2. This could be improved using a
template plugin for values display on load.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index bc73a8d..61df789 100755 (executable)
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -263,6 +263,8 @@ foreach my $r (@{$budgets}) {
     push @{$budget_loop}, {
         b_id  => $r->{budget_id},
         b_txt => $r->{budget_name},
+        b_sort1_authcat => $r->{'sort1_authcat'},
+        b_sort2_authcat => $r->{'sort2_authcat'},
         b_active => $r->{budget_period_active},
         b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0,
     };
@@ -277,37 +279,8 @@ if ($close) {
 
 }
 
-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(@{$budgets}){
-    $CGIsort1 = GetAuthvalueDropbox(  @$budgets[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(@{$budgets}) {
-    $CGIsort2 = GetAuthvalueDropbox(  @$budgets[0]->{sort2_authcat}, '' );
-}
-
-if ($CGIsort2) {
-    $template->param( CGIsort2 => $CGIsort2 );
-} else {
-    $template->param( sort2 => $data->{'sort2'} );
-}
+$template->param( sort1 => $data->{'sort1'} );
+$template->param( sort2 => $data->{'sort2'} );
 
 if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) {
     # Check if ACQ framework exists

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 6b825b9..9bb2b8c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -141,6 +141,24 @@ $(document).ready(function()
                 $('#budget_id .b_inactive').remove();
             }
         });
+
+        $("#budget_id").change(function(){
+            var destination_sort1 = $(this).parents('fieldset.rows').find('input[name="sort1"]');
+            var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat');
+            var sort1 = $(destination_sort1).val() || "";
+            if ( destination_sort1.length < 1 ) {
+                destination_sort1 = $(this).parents('fieldset.rows').find('select[name="sort1"]');
+            }
+            var destination_sort2 = $(this).parents('fieldset.rows').find('input[name="sort2"]');
+            var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat');
+            var sort2 = $(destination_sort2).val() || "";
+            if ( destination_sort2.length < 1 ) {
+                destination_sort2 = $(this).parents('fieldset.rows').find('select[name="sort2"]');
+            }
+            getAuthValueDropbox( 'sort1', sort1_authcat, destination_sort1, sort1 );
+            getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2, sort2 );
+        });
+        $("#budget_id").change();
     });
 //]]>
 </script>
@@ -414,14 +432,14 @@ $(document).ready(function()
                     <input type="hidden" name="budget_id" id="budget_id" value="[% budget_id %]" />[% Budget_name %]
                 [% ELSE %]
                 <label class="required" for="budget_id">Fund: </label>
-                <select id="budget_id" onchange="fetchSortDropbox(this.form)" size="1" name="budget_id">
+                <select id="budget_id" size="1" name="budget_id">
                         <option value="">Select a fund</option>
                 [% FOREACH budget_loo IN budget_loop %]
                     [% IF ( budget_loo.b_sel ) %]
-                        <option value="[% budget_loo.b_id %]" selected="selected">[% budget_loo.b_txt %]</option>
+                        <option value="[% budget_loo.b_id %]" selected="selected" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
                     [% ELSE %]
-                        [% IF ( budget_loo.b_active ) %]<option value="[% budget_loo.b_id %]">[% budget_loo.b_txt %]</option>
-                        [% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive">[% budget_loo.b_txt %] (inactive)</option>
+                        [% IF ( budget_loo.b_active ) %]<option value="[% budget_loo.b_id %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
+                        [% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %] (inactive)</option>
                         [% END %]
                     [% END %]
                 [% END %]
@@ -544,39 +562,10 @@ $(document).ready(function()
             </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>
-                <span id="sort1_zone">
-                [% IF CGIsort1 %]
-                    <select id="sort1" size="1" name="sort1">
-                    [% FOREACH sort_opt IN CGIsort1 %]
-                       [% IF sort_opt.default %]
-                          <option value="[% sort_opt.value %]" selected="selected">[% sort_opt.label %]</option>
-                        [% ELSE %]
-                          <option value="[% sort_opt.value %]">[% sort_opt.label %]</option>
-                        [% END %]
-                    [% END %]
-                    </select>
-                [% ELSE %]
-                    <input type="text" id="sort1" size="20" name="sort1" value="[% sort1 %]" />
-                [% END %]
-                </span>
-            </li>
+                <input id="sort1" type="text" id="sort1" size="20" name="sort1" value="[% sort1 %]" />
             <li>
                 <label for="sort2">Statistic 2: </label>
-                <span id="sort2_zone">
-                [% IF CGIsort2 %]
-                    <select id="sort2" size="1" name="sort2">
-                    [% FOREACH sort_opt IN CGIsort2 %]
-                       [% IF sort_opt.default %]
-                          <option value="[% sort_opt.value %]" selected="selected">[% sort_opt.label %]</option>
-                        [% ELSE %]
-                          <option value="[% sort_opt.value %]">[% sort_opt.label %]</option>
-                        [% END %]
-                    [% END %]
-                    </select>
-                [% ELSE %]
-                    <input type="text" id="sort2" size="20" name="sort2" value="[% sort2 %]" />
-                [% END %]
-                </span>
+                <input id="sort2" type="text" id="sort2" size="20" name="sort2" value="[% sort2 %]" />
             </li>
         </ol>
     </fieldset>