Changeset 6373

Timestamp:

06/01/12 02:21:15 (12 years ago)

Author:

natan

Message:

Ticket #2824 - Problema ao sinalizar uma mensagem depois de excluir uma regra de filtro. - Corrigido

File:

• trunk/prototype/api/controller.php (modified) (5 diffs)

trunk/prototype/api/controller.php

@@ -534 +534 @@
             return( $URI );
         }
+        
+        public static function finalizeCommit( $TX, $params, $original, $method )
+        {
+            $TX['rollback'] = !!!$params['properties'];
+
+            if( $params['properties'] && is_array($params['properties']) && isset($params['properties']['id']) )
+                $TX['id'] = $params['properties']['id'];
+
+            self::$tx[ $params['URI']['service'] ][] = array_merge( $TX, $original['URI'], array( 'service' => $params['URI']['service'], 'method' => $method ) );
+
+            if( isset($commit) && $commit )
+            {
+                if( !self::call( 'commit', $params['URI'], false, self::$tx[ $params['URI']['service'] ] ) )
+                    self::call( 'rollback', $params['URI'] , false, self::$tx[ $params['URI']['service'] ] );
+
+                unset( self::$tx[ $params['URI']['service'] ] );
+            }
+
+            return( empty($params['properties']) ? false : $params['properties'] );
+        }
 
         //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmos nas options passadas
@@ -548 +568 @@
 
                 if( isset($params['URI']['concept'])  && !self::fire( 'before', $method, $params, $original ) )
-                    return( empty($params['properties']) ? false : $params['properties'] );
+                   return( !isset($TX) ? empty($params['properties']) ? false : $params['properties'] : self::finalizeCommit( $TX, $params, $original, $method ) );
 
                 
@@ -572 +592 @@
 
                     if( !self::fire( 'before', $method, $params, $original, true ) )
-                        return( empty($params['properties']) ? false : $params['properties'] );
+                        return( !isset($TX) ? empty($params['properties']) ? false : $params['properties'] : self::finalizeCommit( $TX, $params, $original, $method ) );
                 }
 
@@ -612 +632 @@
                 if( isset($params['URI']['service']) )
                     if( !self::fire( 'after', $method, $params, $original, true ) )
-                        return( empty($params['properties']) ? false : $params['properties'] );
+                        return( !isset($TX) ? empty($params['properties']) ? false : $params['properties'] : self::finalizeCommit( $TX, $params, $original, $method ) );
 
                 if( isset($URI['concept']) )
@@ -621 +641 @@
 
                 if( isset( $TX ) )
-                {
-                    $TX['rollback'] = !!!$params['properties'];
-
-                    if( $params['properties'] && is_array($params['properties']) && isset($params['properties']['id']) )
-                        $TX['id'] = $params['properties']['id'];
-
-                    self::$tx[ $params['URI']['service'] ][] = array_merge( $TX, $original['URI'], array( 'service' => $params['URI']['service'], 'method' => $method ) );
-
-                    if( isset($commit) && $commit )
-                    {
-                        if( !self::call( 'commit', $params['URI'], false, self::$tx[ $params['URI']['service'] ] ) )
-                            self::call( 'rollback', $params['URI'] , false, self::$tx[ $params['URI']['service'] ] );
-
-                        unset( self::$tx[ $params['URI']['service'] ] );
-                    }
-                }
+                    self::finalizeCommit( $TX, $params, $original, $method );
             }
             catch( Exception $e )