Changeset 2230

Timestamp:

03/11/10 18:18:26 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #799 - Correcao de erro ao delegar um evento sem selecionar usuário

Location:

trunk/calendar

Files:

• inc/class.bocalendar.inc.php (modified) (1 diff)
• inc/class.uicalendar.inc.php (modified) (2 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)

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

@@ -384 +384 @@
                         $this->so->cal->stream->lock(array("phpgw_cal_user"));
                         $sql = "SELECT * FROM phpgw_cal_user where cal_id=$idEvento and cal_login=$idDelegado";
-                        
-                        $this->so->cal->stream->query($sql,__LINE__,__FILE__);
-                        if($this->so->cal->stream->next_record())
-                        {
-                                throw new Exception("The selected User is already included in this event");
-                        }else{
-                                $sql = "update phpgw_cal_user set cal_login = $idDelegado,cal_status='U' where cal_id=$idEvento 
+
+                        if($idDelegado != '')
+                        {
+                                $this->so->cal->stream->query($sql,__LINE__,__FILE__);
+                                if($this->so->cal->stream->next_record())
+                                {
+                                        throw new Exception("The selected User is already included in this event");
+                                }else{
+                                        $sql = "update phpgw_cal_user set cal_login = $idDelegado,cal_status='U' where cal_id=$idEvento 
                                                 and cal_login=$idDelegador";
 
-                                $this->so->cal->stream->query($sql,__LINE__,__FILE__,0,-1,true);
+                                        $this->so->cal->stream->query($sql,__LINE__,__FILE__,0,-1,true);
                                 
-                                $event = $this->so->read_entry($idEvento);
-
-                                $this->send_update(MSG_ADDED,array($idDelegado => 'U'),$event,$event);
-                        }
+                                        $event = $this->so->read_entry($idEvento);
+
+                                        $this->send_update(MSG_ADDED,array($idDelegado => 'U'),$event,$event);
+                                }
+                        }else {
+                                throw new Exception('999');
+                        }
+
                         $this->so->cal->stream->unlock();
                 }

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

@@ -218 +218 @@
 
                         if(isset($_REQUEST["error"]))
-                                $var['error_msg'] = lang("Problems delegating. Make sure you haven't delegated to a person that was also invited to the meeting");
+                        {
+                                if($_REQUEST["error"] == 999){
+                                        $var['error_msg'] = lang("Problems delegating. Make sure you have selected a user to delegate the appointment.");
+                                }else {
+                                        $var['error_msg'] = lang("Problems delegating. Make sure you haven't delegated to a person that was also invited to the meeting");
+                                }
+                        }
 
                         $template = CreateObject('phpgwapi.Template',$this->template_dir);
@@ -239 +245 @@
                                 header("Location: index.php?menuaction=calendar.uicalendar.day&date=".$_REQUEST['date']);
                         }catch(Exception $e) {
-                                header("Location: index.php?menuaction=calendar.uicalendar.screen_delegate_event&id_event=". $_REQUEST["event"]."&delegator=".$_REQUEST["delegator"]."&date=".$_REQUEST["date"]."&error=1");
+                                if($e->getMessage() == '999') {
+                                        header("Location: index.php?menuaction=calendar.uicalendar.screen_delegate_event&id_event=". $_REQUEST["event"]."&delegator=".$_REQUEST["delegator"]."&date=".$_REQUEST["date"]."&error=999");
+                                }else {
+                                        header("Location: index.php?menuaction=calendar.uicalendar.screen_delegate_event&id_event=". $_REQUEST["event"]."&delegator=".$_REQUEST["delegator"]."&date=".$_REQUEST["date"]."&error=1");
+                                }
                         }
                 }