Changeset 5804 for trunk/prototype/modules/calendar/interceptors/DBMapping.php

Timestamp:

03/23/12 16:39:10 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Implementada funcionalidade de criacao de agenda para contas compartilhadas e imposicao de agendas

File:

• trunk/prototype/modules/calendar/interceptors/DBMapping.php (modified) (2 diffs)

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -468 +468 @@
                         
                         foreach($newResult as $key => &$value){
-                                if($value['user']  != 0)
-                                        $value['user'] = Controller::read( array( 'concept' => 'user' , 'id' => $value['user'] ));
+                                if($value['user']  != 0){
+                                    $user = $value['user'];
+                                    $value['user'] = Controller::read( array( 'concept' => 'user' , 'id' => $user ));
+
+                                    if(!$value['user'])
+                                        $value['user'] = Controller::read( array( 'concept' => 'group' , 'id' => $user ));
+                                }
                         }
 
@@ -640 +645 @@
                 if(isset($v['calendar'])){
                     $result[$i]['calendar'] = Controller::read( array( 'concept' => 'calendar' , 'id' => $v['calendar']), false, false); 
-                                        $result[$i]['defaultAlarms'] = Controller::find( array( 'concept' => 'calendarSignatureAlarm' ) , false ,array( 'filter' => array('=', 'calendarSignature'  ,  $v['id']) ));    
-                                        //Caso não seja o dono da agenda retorna o objeto permission com as acls
-                                        if($result[$i]['isOwner'] == 0){
-                                                $permission = Controller::find( array( 'concept' => 'calendarToPermission'), false ,array( 'filter' => array('AND', array('=', 'calendar' ,  $v['calendar']), array('=', 'user', Config::me('uidNumber') ) ) ) ); 
-
-                                                if(!is_array($permission) || !$permission  ){
-
-                                                        $permission = Controller::find( array( 'concept' => 'calendarToPermission'), false ,array( 'filter' => array('AND', array('=', 'calendar' ,  $v['calendar']), array('=', 'type', '1' ) ) ) );    
-
-                                                }
-                                                $result[$i]['permission'] = $permission[0];
-                                        }
-                                }
-           }
+                    $result[$i]['defaultAlarms'] = Controller::find( array( 'concept' => 'calendarSignatureAlarm' ) , false ,array( 'filter' => array('=', 'calendarSignature'  ,  $v['id']) ));    
+                    //Caso não seja o dono da agenda retorna o objeto permission com as acls
+                    if($result[$i]['isOwner'] == 0){
+                            $permission = Controller::find( array( 'concept' => 'calendarToPermission'), false ,array( 'filter' => array('AND', array('=', 'calendar' ,  $v['calendar']), array('=', 'user', Config::me('uidNumber') ) ) ) ); 
+
+                            if(!is_array($permission) || !$permission  ){
+
+                                    $permission = Controller::find( array( 'concept' => 'calendarToPermission'), false ,array( 'filter' => array('AND', array('=', 'calendar' ,  $v['calendar']), array('=', 'type', '1' ) ) ) );    
+
+                            }
+                            $result[$i]['permission'] = $permission[0];
+                    }
+            }
+            //TODO - Padronizar retorno do deepness
+//            if(isset($v['user']))
+//                $result[$i]['user'] = Controller::read( array( 'concept' => 'user' , 'id' => $v['user']), false, false); 
+          }
        }       
    }