Changeset 7556 for branches/2.4/prototype/modules/calendar/interceptors/DBMapping.php

Timestamp:

11/23/12 11:29:18 (11 years ago)

Author:

eduardow

Message:

Ticket #3193 - Excluir atividade não possibilita excluir tarefas.

File:

• branches/2.4/prototype/modules/calendar/interceptors/DBMapping.php (modified) (1 diff)

branches/2.4/prototype/modules/calendar/interceptors/DBMapping.php

@@ -1174 +1174 @@
             $uri['id'] = $idSchedulable;
             
-            if(isset($criteria['filter']) && isset($criteria['filter'][4]) && isset($criteria['filter'][4][2])){
-                Controller::deleteALL(array('concept' => 'taskToActivity'), null, array('filter' => array('=', 'activity', $idSchedulable)));
-            }
+         
+
+                        if(isset($criteria['type']) && $criteria['type'] == '2'){ 
+                 
+                $tasks = Controller::find(array('concept' => 'taskToActivity'), array('task'), array('filter' => array('=', 'activity', $idSchedulable))); 
+ 
+                if(is_array( $tasks ) and count( $tasks ) > 0){ 
+                    Controller::delete(array('concept' => 'taskToActivity'), null, array('filter' => array('=', 'activity', $idSchedulable))); 
+                } 
+ 
+                if(isset($criteria['removeTaskToActivity']) && $criteria['removeTaskToActivity']){ 
+                    if(is_array( $tasks ) and count( $tasks ) > 0){ 
+ 
+                        $ids = array(); 
+                        foreach($tasks as $v){ 
+                            $ids[] = $v['task']; 
+                        } 
+ 
+                        Controller::delete(array('concept' => 'schedulable'), false, array('filter' => array('IN','id', $ids ))); 
+                    } 
+                } 
+            } 
         }