Changeset 5539 for trunk/prototype/api

Timestamp:

02/23/12 17:14:32 (12 years ago)

Author:

airton

Message:

Ticket #2088 - Melhorias no editor de regras de filtro de mensagens do Expresso

Location:

trunk/prototype/api

Files:

• controller.php (modified) (3 diffs)
• datalayer.js (modified) (1 diff)

trunk/prototype/api/controller.php

@@ -422 +422 @@
                 foreach( $interceptors[ $eventType ] as $intercept => $interceptor )
                 {
-                    $return = $interceptor->$intercept( $params['URI'], $params['properties'], $params['criteria'], $original/*, $params['service']*/ );
+                    $return = $interceptor->$intercept( $params['URI'], $params['properties'], $params['criteria'], $original /*, $params['service'] */);
 
                     if( $return === false )
@@ -560 +560 @@
                     $TX['rollback'] = !!!$params['properties'];
 
-                    if( $params['properties'] && isset($params['properties']['id']) )
+                    if( $params['properties'] && is_array($params['properties']) && isset($params['properties']['id']) )
                         $TX['id'] = $params['properties']['id'];
 
@@ -639 +639 @@
                 $result = Controller::call( $method, $URI, $data, false, false, true );
 
-                if( !is_bool( $result ) && !is_string( $result ) && isset( $result['id'] ) )
+                if( is_array( $result ) && isset( $result['id'] ) )
                       $URI['id'] = $result['id'];
 

trunk/prototype/api/datalayer.js

@@ -89 +89 @@
     var $this = $(this), action = $this.attr('action'), res = false,
     
-    method = $this.attr( 'method' ),
+    method = $this.attr( 'method' ) || 'POST',
     
     fileInputs = $this.find('input[type="file"]');