Changeset 7981 for trunk

Timestamp:

03/08/13 14:55:03 (12 years ago)

Author:

cristiano

Message:

Ticket #3378 - Importação automatica de eventos nos participantes

File:

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

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

@@ -1400 +1400 @@
 
     public function deleteCalendarSignatureDependences(&$uri, &$params, &$criteria, $original) {
-        $signature = Controller::read($uri, array('isOwner', 'calendar'));
+        $signature = Controller::read($uri, array('isOwner', 'calendar','user'));
 
         if ($signature['isOwner'] == '1') {
@@ -1416 +1416 @@
 
         $autoCommit = Controller::service('PostgreSQL')->execResultSql('Select config_value FROM phpgw_config WHERE config_app = \'expressoCalendar\' AND config_name = \'expressoCalendar_autoImportCalendars\'');
+
         if(isset($autoCommit[0]) && $autoCommit[0]['config_value'] == 'true')
         {
-            $defaultCalendar = Controller::find(array('concept' => 'modulePreference'), array('value','id') , array('filter' => array( 'and' , array('=' , 'name' , 'dafaultImportCalendar') , array('=' , 'module' , 'expressoCalendar') , array('=' , 'user' , $original['properties']['user'])  )) );
+            $defaultCalendar = Controller::find(array('concept' => 'modulePreference'), array('value','id') , array('filter' => array( 'and' , array('=' , 'name' , 'dafaultImportCalendar') , array('=' , 'module' , 'expressoCalendar') , array('=' , 'user' , $signature['user'])  )) );
+
+
+            self::lg($defaultCalendar);
             if(isset($defaultCalendar[0])  && $defaultCalendar[0]['value'] == $signature['calendar'] )
             {