From 792e25ee49942c23b91b368cbcad626ea1d44a03 Mon Sep 17 00:00:00 2001 From: Garry Collum Date: Tue, 9 Jun 2009 18:34:55 -0400 Subject: [PATCH] Bug 2889: Removed toggle variable from categorie.pl and categorie.tmpl. Removed toggle variable from categorie.pl and categorie.tmpl. Used template __odd__variable in categorie.tmpl. Signed-off-by: Galen Charlton --- admin/categorie.pl | 16 ++++++---------- .../prog/en/modules/admin/categorie.tmpl | 6 +++++- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/admin/categorie.pl b/admin/categorie.pl index 70de77393b..692bf6d1c1 100755 --- a/admin/categorie.pl +++ b/admin/categorie.pl @@ -174,7 +174,6 @@ if ($op eq 'add_form') { $template->param(else => 1); my @loop; my ($count,$results)=StringSearch($searchfield,'web'); - my $toggle = 0; for (my $i=0; $i < $count; $i++){ my %row = (categorycode => $results->[$i]{'categorycode'}, description => $results->[$i]{'description'}, @@ -188,15 +187,12 @@ if ($op eq 'add_form') { category_type => $results->[$i]{'category_type'}, "type_".$results->[$i]{'category_type'} => 1, toggle => $toggle ); - push @loop, \%row; - if ( $toggle eq 0 ) - { - $toggle = 1; - } - else - { - $toggle = 0; - } + if (C4::Context->preference('EnhancedMessagingPreferences')) { + my $brief_prefs = _get_brief_messaging_prefs($results->[$i]{'categorycode'}); + $row{messaging_prefs} = $brief_prefs if @$brief_prefs; + } + + push @loop, \%row; } $template->param(loop => \@loop); # check that I (institution) and C (child) exists. otherwise => warning to the user diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl index 81b8962753..9b8c9eaa7b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl @@ -224,7 +224,11 @@ Confirm Deletion of Category   - + + + + + ?op=add_form&categorycode="> -- 2.39.5