Changeset 1949 for trunk/calendar

Timestamp:

01/26/10 09:13:57 (14 years ago)

Author:

eduardoalex

Message:

Ticket #715 - Corrigido a montagem do combo tipo de evento e alterado o tipo do compromisso privado de e para P

Location:

trunk/calendar/inc

Files:

• class.bocalendar.inc.php (modified) (1 diff)
• class.socalendar_sql.inc.php (modified) (1 diff)
• class.uicalendar.inc.php (modified) (1 diff)

trunk/calendar/inc/class.bocalendar.inc.php

@@ -919 +919 @@
                                 }
 
-                                $is_public = ($l_cal['type'] != 'private');
+                                $is_public = ($l_cal['type'] != 'private' && $l_cal['type'] != 'privateHiddenFields');
                                 $this->so->event_init();
                                 $this->add_attribute('uid',$l_cal['uid']);

trunk/calendar/inc/class.socalendar_sql.inc.php

@@ -957 +957 @@
                                 if ($event['type'] == 'hourAppointment')
                                         $type = 'H';
-                                else
+                                else if($event['type'] == 'privateHiddenFields'){
+                                        $type = 'P';
+                                }else
                                         $type = 'E';
                         }

trunk/calendar/inc/class.uicalendar.inc.php

@@ -5041 +5041 @@
                         $var['access'] = Array(
                         'field' => lang('Type'),
-                        'data'  => '<select onchange="javascript:changeViewMode(this.value);" id="cal[type]" name="cal[type]" '.($event['type'] == 'H'?'DISABLED':'').'><option value="normal">'.lang('Normal').'</option><option value="private" '.(!$event['public']?'SELECTED':'').' >'. lang('Restrict').'</option><option value="privateHiddenFields" '.(!$event['public']?'SELECTED':'').' >'. lang('Private').'</option><option value="hourAppointment" '.($event['type'] == 'H'?'SELECTED':'').' >'.lang('Hours Appointment').'</option></select>'
+                        'data'  => '<select onchange="javascript:changeViewMode(this.value);" id="cal[type]" name="cal[type]" '.($event['type'] == 'H'?'DISABLED':'').'><option value="normal" '.(($event['public'] && $event['type'] == 'E')?'SELECTED':'').' >'.lang('Normal').'</option><option value="private" '.((!$event['public'] && $event['type'] == 'E')?'SELECTED':'').' >'. lang('Restrict').'</option><option value="privateHiddenFields" '.($event['type']=='P'?'SELECTED':'').' >'. lang('Private').'</option><option value="hourAppointment" '.($event['type'] == 'H'?'SELECTED':'').' >'.lang('Hours Appointment').'</option></select>'
                         ); //event['public']