fix for #908

In an list of autorised values (Parameters >autotised values), if you delete an
autorised value after confirm, you go back to the first page of the list, and
you must return manually to the page you left before.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index f30193e..9c85a01 100755 (executable)
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -90,7 +90,8 @@ if ($op eq 'add_form') {
                          authorised_value => $data->{'authorised_value'},
                          lib              => $data->{'lib'},
                          id               => $data->{'id'},
-                         imagesets        => C4::Koha::getImageSets( checked => $data->{'imageurl'} )
+                         imagesets        => C4::Koha::getImageSets( checked => $data->{'imageurl'} ),
+                         offset           => $offset,
                      );
                           
 ################## ADD_VALIDATE ##################################
@@ -123,7 +124,7 @@ if ($op eq 'add_form') {
             my $lib = $input->param('lib');
             undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
             $sth->execute($new_category, $new_authorised_value, $lib, $imageurl, $id);          
-            print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$new_category."\"></html>";
+            print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$new_category."&offset=$offset\"></html>";
             exit;
         }
     }
@@ -139,7 +140,7 @@ if ($op eq 'add_form') {
            my $lib = $input->param('lib');
            undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
            $sth->execute($id, $new_category, $new_authorised_value, $lib, $imageurl );
-           print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."\"></html>";
+           print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."&offset=$offset\"></html>";
            exit;
         }
     }
@@ -170,7 +171,7 @@ if ($op eq 'add_form') {
        my $id = $input->param('id');
        my $sth=$dbh->prepare("delete from authorised_values where id=?");
        $sth->execute($id);
-       print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=$searchfield\"></html>";
+       print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=$searchfield&offset=$offset\"></html>";
        exit;
                                                                                                        # END $OP eq DELETE_CONFIRMED
 ################## DEFAULT ##################################
@@ -218,8 +219,8 @@ sub default_form {
                $row_data{authorised_value} = $results->[$i]{'authorised_value'};
                $row_data{lib}              = $results->[$i]{'lib'};
                $row_data{imageurl}         = getitemtypeimagelocation( 'intranet', $results->[$i]{'imageurl'} );
-               $row_data{edit}             = "$script_name?op=add_form&amp;id=".$results->[$i]{'id'};
-               $row_data{delete}           = "$script_name?op=delete_confirm&amp;searchfield=$searchfield&amp;id=".$results->[$i]{'id'};
+               $row_data{edit}             = "$script_name?op=add_form&amp;id=".$results->[$i]{'id'}."&offset=$offset";
+               $row_data{delete}           = "$script_name?op=delete_confirm&amp;searchfield=$searchfield&amp;id=".$results->[$i]{'id'}."&offset=$offset";
                push(@loop_data, \%row_data);
        }
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
index 716b5d2..46abf44 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
@@ -42,6 +42,7 @@
        </h1>
        <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
        <input type="hidden" name="op" value="add_validate" />
+    <input type="hidden" name="offset" value="<!-- TMPL_VAR name="offset" -->" />
         <fieldset class="rows"><ol>
         <li>
                         <!-- TMPL_IF name="action_add_category" --><label for="category">Category</label>