Merge remote branch 'kc/master' into new/bug_3013

[koha.git] / admin / authorised_values.pl

diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index 34d04fb..c26f3a9 100755 (executable)
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -13,9 +13,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
@@ -52,19 +52,14 @@ $searchfield =~ s/\,//g;
 my $script_name = "/cgi-bin/koha/admin/authorised_values.pl";
 my $dbh = C4::Context->dbh;
 
-# my $subpermission = C4::Context->preference('GranularPermissions') ? 
-#     { editcatalogue => ... } :
-#     {    parameters => 1   } ;
-
 my ($template, $borrowernumber, $cookie)= get_template_and_user({
     template_name => "admin/authorised_values.tmpl",
     authnotrequired => 0,
-    flagsrequired => {parameters => 1},     # soon $subpermission
+    flagsrequired => {parameters => 1},
     query => $input,
     type => "intranet",
     debug => 1,
 });
-my $pagesize = 20;
 
 $template->param(  script_name => $script_name,
                  ($op||'else') => 1 );
@@ -81,15 +76,15 @@ if ($op eq 'add_form') {
        }
        if ($id) {
                $template->param(action_modify => 1);
-               $template->param('heading-modify-authorized-value-p' => 1);
+               $template->param('heading_modify_authorized_value_p' => 1);
        } elsif ( ! $data->{'category'} ) {
                $template->param(action_add_category => 1);
-               $template->param('heading-add-new-category-p' => 1);
+               $template->param('heading_add_new_category_p' => 1);
        } else {
                $template->param(action_add_value => 1);
-               $template->param('heading-add-authorized-value-p' => 1);
+               $template->param('heading_add_authorized_value_p' => 1);
        }
-       $template->param('use-heading-flags-p' => 1);
+       $template->param('use_heading_flags_p' => 1);
        $template->param( category        => $data->{'category'},
                          authorised_value => $data->{'authorised_value'},
                          lib              => $data->{'lib'},
@@ -224,7 +219,7 @@ sub default_form {
     my $count = scalar(@$results);
        my @loop_data = ();
        # builds value list
-       for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
+       for (my $i=0; $i < $count; $i++){
                my %row_data;  # get a fresh hash for the row data
                $row_data{category}              = $results->[$i]{'category'};
                $row_data{authorised_value}      = $results->[$i]{'authorised_value'};
@@ -239,19 +234,5 @@ sub default_form {
        $template->param( loop     => \@loop_data,
                           tab_list => $tab_list,
                           category => $searchfield );
-
-       if ($offset>0) {
-               my $prevpage = $offset-$pagesize;
-               $template->param(isprevpage => $offset,
-                                               prevpage=> $prevpage,
-                                               searchfield => $searchfield,
-                );
-       }
-       if ($offset+$pagesize<$count) {
-               my $nextpage =$offset+$pagesize;
-               $template->param(nextpage =>$nextpage,
-                                               searchfield => $searchfield,
-               );
-       }
 }