From 4c58011f4821a8d8ff84006dfc0c87b434a27865 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 13 Jul 2011 15:45:38 -0400 Subject: [PATCH] Fix for 6426 - messaging not showing on patron categories T:T variable name problems were causing the problem. I used this opportunity to change the way the data is output: Now the messaging preferences are only output if there is a current setting. Also corrected the js table sorter configuration for the right columns and moved the template-based table row striping to the tablesorter plugin config. Signed-off-by: Nicole C. Engard Signed-off-by: Chris Cormack --- .../prog/en/modules/admin/categorie.tt | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt index a916a4bf8e..c2e5062c7a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt @@ -9,7 +9,8 @@ [% INCLUDE 'calendar.inc' %] @@ -300,11 +301,7 @@ Confirm Deletion of Category [% categorycode |html %][% END %]   [% FOREACH loo IN loop %] - [% UNLESS ( loop.odd ) %] - - [% ELSE %] - [% END %] [% loo.categorycode |html %] [% loo.description |html %] @@ -332,22 +329,25 @@ Confirm Deletion of Category [% categorycode |html %][% END %] [% IF ( loo.hidelostitems ) %]Hidden[% ELSE %]Shown[% END %] [% loo.reservefee %] [% IF ( EnhancedMessagingPreferences ) %] - + [% IF ( loo.messaging_prefs ) %] - [% IF ( messaging_preference.Item_Due ) %]Item Due - [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance Notice - [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming Events - [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold Filled - [% ELSIF ( messaging_preference.Item_Check_in ) %]Item Check-in - [% ELSIF ( messaging_preference.Item_Checkout ) %]Item Checkout - [% ELSE %]Unknown - [% END %] : - [% FOREACH transport IN messaging_pref.transports %] - [% transport.transport %] - [% END %] -
+ [% FOREACH prefs IN loo.messaging_prefs %] + [% FOREACH transport IN prefs.transports %] + [% IF ( transport.transport ) %] + [% IF ( prefs.Item_Due ) %]Item Due + [% ELSIF ( prefs.Advance_Notice ) %]Advance Notice + [% ELSIF ( prefs.Upcoming_Events ) %]Upcoming Events + [% ELSIF ( prefs.Hold_Filled ) %]Hold Filled + [% ELSIF ( prefs.Item_Check_in ) %]Item Check-in + [% ELSIF ( prefs.Item_Checkout ) %]Item Checkout + [% ELSE %]Unknown + [% END %]: + [% transport.transport %]
+ [% ELSE %]None
[% END %] + [% END %] + [% END %] [% ELSE %] - none + None [% END %] [% END %] -- 2.39.5