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

Timestamp:

09/04/12 17:09:47 (12 years ago)

Author:

acoutinho

Message:

Ticket #3062 - Incluir o uid do dono de uma agenda ao pesquisa-la

File:

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

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

@@ -744 +744 @@
     }
 
-    public function deepnessFindCalendarShared(&$uri, &$result, &$criteria, $original) {    
+    public function deepnessFindCalendarShared(&$uri, &$result, &$criteria, $original) {
         if (isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != '0' && count($result) > 0) {
 
             $calendarIds = array();
-            foreach ($result as $key => $value)
-                array_push($calendarIds, $value['calendar']);
+            foreach ($result as $value)
+                    $calendarIds[] = $value['calendar'];
 
             $calendar = Controller::find(array('concept' => 'calendar'), false, array('filter' => array('AND', array('IN', 'id', $calendarIds))));
@@ -755 +755 @@
             if ($calendar && count($calendar) > 0){
                 $newResult = array();
-                        foreach ($calendar as $key => $value) {
-                            foreach ($result as $k => $r) {
+                        foreach ($calendar as  $value) {
+                            foreach ($result as  $r) {
 
                                 if ($r['calendar'] == $value['id']) {
                                     $r['calendar'] = $value;
-                                    array_push($newResult, $r);
+                                    $newResult[] = $r;
                                 }
                             }
                         }
 
-                        foreach ($newResult as $key => &$value) {
+                        foreach ($newResult as &$value) {
                             if ($value['user'] != 0) {
-                                $user = $value['user'];
-                                $value['user'] = Controller::read(array('concept' => 'user', 'id' => $user));
+                                $value['user'] = Controller::read(array('concept' => 'user', 'id' => $value['user']));
 
                                 if (!$value['user'])
-                                    $value['user'] = Controller::read(array('concept' => 'group', 'id' => $user));
+                                    $value['user'] = Controller::read(array('concept' => 'group', 'id' => $value['user']));
                             }
+                    $value['owner'] = Controller::read(array('concept' => 'user', 'id' => $value['owner']));
                         }
-
                         $result = $newResult;
             }else
@@ -955 +954 @@
                     //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')))));
+                        $permission = Controller::find(array('concept' => 'calendarToPermission'), false, array('filter' => array('AND', array('=', 'calendar', $v['calendar']), array('=', 'user', Config::me('uidNumber')), 'deepness' => 2)));
 
                         if (!is_array($permission) || !$permission) {
 
-                            $permission = Controller::find(array('concept' => 'calendarToPermission'), false, array('filter' => array('AND', array('=', 'calendar', $v['calendar']), array('=', 'type', '1'))));
+                            $permission = Controller::find(array('concept' => 'calendarToPermission'), false, array('filter' => array('AND', array('=', 'calendar', $v['calendar']), array('=', 'type', '1')), 'deepness' => 2 ));
                         }
                         $result[$i]['permission'] = $permission[0];