Fix for Bug 5140 - In Chrome, drop-down menus disappear after using pop-up calendar

[koha_fer] / admin / auth_tag_structure.pl

diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl
index 4cd9b75..27c48e9 100755 (executable)
--- a/admin/auth_tag_structure.pl
+++ b/admin/auth_tag_structure.pl
@@ -14,11 +14,12 @@
 # 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; FIXME - Bug 2505
 use CGI;
 use C4::Auth;
 use C4::Koha;
@@ -38,7 +39,7 @@ my $offset      = $input->param('offset') || 0;
 my $op          = $input->param('op')     || '';
 $searchfield =~ s/\,//g;
 
-my $pagesize    = 20;
+
 my $script_name = "/cgi-bin/koha/admin/auth_tag_structure.pl";
 
 my $dbh = C4::Context->dbh;
@@ -84,7 +85,7 @@ if (!$op or $op eq 'authtype_create_confirm') {
 }
 $template->param(script_name  => $script_name);
 $template->param(authtypeloop => \@authtypesloop);
-if ($op ne 'authtype_create_confirm') {
+if ($op && $op ne 'authtype_create_confirm') {
     $template->param($op  => 1);
 } else {
     $template->param(else => 1);
@@ -119,13 +120,13 @@ if ($op eq 'add_form') {
        if ($searchfield) {
                $template->param(action => "Modify tag",
                                                                searchfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$searchfield\" />$searchfield");
-               $template->param('heading-modify-tag-p' => 1);
+               $template->param('heading_modify_tag_p' => 1);
        } else {
                $template->param(action => "Add tag",
                                                                searchfield => "<input type=\"text\" name=\"tagfield\" size=\"5\" maxlength=\"3\" />");
-               $template->param('heading-add-tag-p' => 1);
+               $template->param('heading_add_tag_p' => 1);
        }
-       $template->param('use-heading-flags-p' => 1);
+       $template->param('use_heading_flags_p' => 1);
        $template->param(liblibrarian => $data->{'liblibrarian'},
                                                        libopac => $data->{'libopac'},
                                                        repeatable => "".$data->{'repeatable'},
@@ -219,14 +220,8 @@ if ($op eq 'add_form') {
                 $template->param(searchfield => $searchfield);
        }
        my ($count,$results)=StringSearch($searchfield,$authtypecode);
-       my $toggle=1;
        my @loop_data = ();
-       for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-               if ($toggle eq 1){
-                       $toggle=0;
-               } else {
-                       $toggle=1;
-               }
+    for ( my $i = $offset ; $i < $count ; $i++ ) {
                my %row_data;  # get a fresh hash for the row data
         $row_data{tagfield}         = $results->[$i]{'tagfield'};
         $row_data{liblibrarian}     = $results->[$i]{'liblibrarian'};
@@ -236,22 +231,18 @@ if ($op eq 'add_form') {
         $row_data{subfield_link}    = "auth_subfields_structure.pl?tagfield=" . $results->[$i]{'tagfield'} . "&amp;authtypecode=" . $authtypecode;
         $row_data{edit}             = "$script_name?op=add_form&amp;searchfield=" . $results->[$i]{'tagfield'} . "&amp;authtypecode=" . $authtypecode;
         $row_data{delete}           = "$script_name?op=delete_confirm&amp;searchfield=" . $results->[$i]{'tagfield'} . "&amp;authtypecode=" . $authtypecode;
-        $row_data{toggle}           = $toggle;
                push(@loop_data, \%row_data);
        }
        $template->param(loop => \@loop_data,
                                        authtypecode => $authtypecode,
        );
        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,
+    if ( $offset < $count ) {
+               $template->param(
                                                searchfield => $searchfield,
                );
        }