Changeset 6299

Timestamp:

05/24/12 17:20:30 (12 years ago)

Author:

acoutinho

Message:

Ticket #2797 - Agendas sendo assinadas pelo proprio dono

Location:

trunk/prototype

Files:

• modules/calendar/interceptors/DBMapping.php (modified) (2 diffs)
• modules/calendar/js/calendar.shared.js (modified) (3 diffs)
• services/PostgreSQL.php (modified) (1 diff)

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

@@ -463 +463 @@
     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)
@@ -469 +470 @@
             $calendar = Controller::find(array('concept' => 'calendar'), false, array('filter' => array('AND', array('IN', 'id', $calendarIds), $original['criteria']['filter'])));
 
-            if (!is_array($calendar))
-                $result = '';
-
-            $newResult = array();
-            foreach ($calendar as $key => $value) {
-                foreach ($result as $k => $r) {
-
-                    if ($r['calendar'] == $value['id']) {
-                        $r['calendar'] = $value;
-                        array_push($newResult, $r);
+            if ($calendar && count($calendar) > 0){
+                $newResult = array();
+                foreach ($calendar as $key => $value) {
+                    foreach ($result as $k => $r) {
+
+                        if ($r['calendar'] == $value['id']) {
+                            $r['calendar'] = $value;
+                            array_push($newResult, $r);
+                        }
                     }
                 }
-            }
-
-            foreach ($newResult as $key => &$value) {
-                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));
+
+                foreach ($newResult as $key => &$value) {
+                    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));
+                    }
                 }
-            }
-
-
-            $result = $newResult;
+
+                $result = $newResult;
+            }else
+                $result = '';
         }
     }

trunk/prototype/modules/calendar/js/calendar.shared.js

@@ -406 +406 @@
             }, true);
             var resultPublic = DataLayer.get('calendarToPermission', {
-                filter: ['AND', ['=','type',1],   ['OR', ['i*','name',$(this).val()], ["i*", "description", $(this).val()]]]  , 
+                filter: ['AND', ['=','type',1], ['OR', ['i*','name',$(this).val()], ["i*", "description", $(this).val()]], ['!IN','calendar', Calendar.calendarIds]]  , 
                 criteria: {
                     deepness: 2
@@ -444 +444 @@
                     type: 0
                 })
-                resultNormalize[i].enabled = currentCalendars[result[i].id] ? false : true;
+                resultNormalize[(resultNormalize.length - 1)].enabled = currentCalendars[result[i].id] ? false : true;
             }
             if(resultPublic)
@@ -454 +454 @@
                         type: 1
                     })
-                    resultNormalize[i].enabled = currentCalendars[resultPublic[i].id] ? false : true;
+                    resultNormalize[(resultNormalize.length - 1)].enabled = currentCalendars[resultPublic[i].id] ? false : true;
                 }
                                 

trunk/prototype/services/PostgreSQL.php

@@ -306 +306 @@
             case 'or': return( $op );
             case 'in': return array( $op );
+            case '!in': return array( 'NOT IN' );
             case '^': return array( 'like', '%',  '' );
             case '$': return array( 'like',  '', '%' );