Changeset 6183

Timestamp:

05/14/12 22:52:20 (12 years ago)

Author:

natan

Message:

Ticket #2730 - Inconsistências na alteração de eventos

Location:

trunk/prototype/modules/calendar/interceptors

Files:

• DBMapping.php (modified) (3 diffs)
• Notifications.php (modified) (2 diffs)

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

@@ -9 +9 @@
 
     public function encodeCreateSchedulable(&$uri, &$params, &$criteria, $original) {
+        self::encodeSchedulable($params);
+    }
+
+    static function encodeSchedulable(&$params) {
         $params['type_id'] = EVENT_ID;
 
@@ -31 +35 @@
         $params['lastUpdate'] = (isset($params['lastUpdate'])) ? $params['lastUpdate'] : time() . '000';
         $params['type'] = EVENT_ID;
-        $params['uid'] = isset($params['uid']) ? $params['uid'] : $this->_makeUid();
+        $params['uid'] = isset($params['uid']) ? $params['uid'] : self::_makeUid();
     }
 
@@ -922 +926 @@
     }
 
-    private function _makeUid() {
+    private static function _makeUid() {
 
         $date = date('Ymd\THisT');

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

@@ -503 +503 @@
         $alt = false;
 
+//      DBMapping::encodeSchedulable($params);
+
         foreach ($params as $i => $v) //Verifica se ouve alteração no evento
             if (isset($schedulableOld[$i]) && $schedulableOld[$i] != $v && $i != 'participants') {
@@ -508 +510 @@
                 $alt = true;
             }
-
+self::lg( $schedulable, '$schedulable' );
         if (($alt === true) && (Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'], $schedulable['id']))) {
             $method = 'REQUEST';