Reverted menu-left-example.png back to original and cleaned up menu-top-example to...

[freeside.git] / httemplate / browse / part_event.html

diff --git a/httemplate/browse/part_event.html b/httemplate/browse/part_event.html
index 62e7ff0..4b95b86 100644 (file)
--- a/httemplate/browse/part_event.html
+++ b/httemplate/browse/part_event.html
@@ -59,7 +59,7 @@ my $event_sub = sub {
         'link'       => $p.'edit/part_event.html?'.$part_event->eventpart,
       },
       {
-        'data'       => ' (query) ',
+        'data'       => '(query) ',
         'size'       => '-1',
         'data_style' => 'b',
         'onclick'    => $onclick,
@@ -175,8 +175,10 @@ my $html_init =
   '&nbsp;or&nbsp;<SELECT NAME="clone"><OPTION></OPTION>';
 
 foreach my $part_event ( qsearch('part_event', {'disabled'=>''}) ) {
-  $html_init .=  '<OPTION VALUE="'. $part_event->eventpart. '">'.
-                  $part_event->eventpart. ': '. $part_event->event. '</OPTION>';
+  $html_init .= '<OPTION VALUE="'. $part_event->eventpart. '">'.
+                  $part_event->eventpart. ': '. 
+                  encode_entities($part_event->event).
+                '</OPTION>';
 }
 
 $html_init .= '</SELECT><INPUT TYPE="submit" VALUE="Clone existing event">'.
@@ -188,7 +190,7 @@ my $count_query = 'SELECT COUNT(*) FROM part_event WHERE '.
                     'viewall_right' => 'None',
                   );
 
-my $join_conditions  = FS::part_event_condition->join_conditions_sql;
+my $join_conditions  = FS::part_event_condition->join_conditions_sql('', 'time' => time);
 my $order_conditions = FS::part_event_condition->order_conditions_sql;
 
 </%init>