Changeset 5983

Timestamp:

04/20/12 15:26:36 (12 years ago)

Author:

marcieli

Message:

Ticket #2633 - Corrigido bug nos labels, surgiu após melhoria e inserção da coluna slot.

File:

• trunk/prototype/modules/mail/interceptors/Helpers.php (modified) (2 diffs)

trunk/prototype/modules/mail/interceptors/Helpers.php

@@ -69 +69 @@
         }
         
-        //label:before.create
-        public function verifyNameLabel(&$uri , &$params , &$criteria , $original){
-                $nameLabel = $params['name'];
-                $Labels = Controller::find(array('concept' => 'label'), false, array('filter' => array('i=', 'name', $nameLabel) ));
-                if($Labels){
-                        Throw new Exception('Já existe um marcador com esse nome.');
-                }
-        }
-                
         public static function in_arrayr($needle, $haystack) {
                 //if(!is_array($haystack)) return false;
@@ -322 +313 @@
         }       
 
+        //label:before.create 
+        public function validateLabel(&$uri , &$params , &$criteria , $original){ 
+
+                        if( !!Controller::find( array('concept' => 'label'), false, array('filter' => array('i=', 'name', $params['name'])) ) ) 
+                        { 
+                                throw new Exception('Já existe um marcador com esse nome.'); 
+                        } 
+
+                        $used = Controller::read( array( 'concept' => 'label', 'id' => '1' ), array( 'id' ), array( 'uid' => Config::me('uidNumber') ) );
+
+                        if( !isset( $used['id'] ) ) 
+                        { 
+                                $params['id'] = '1'; 
+                                return; 
+                        } 
+
+                        $slot = Controller::service('PostgreSQL')->execSql( 'SELECT label.slot + 1 as id FROM expressomail_label as label, phpgw_config as config WHERE label.user_id = '.Config::me('uidNumber').' AND config.config_name = \'expressoMail_limit_labels\' AND label.slot <= config.config_value::integer AND ( SELECT count(slot) FROM expressomail_label WHERE slot = label.slot + 1 AND user_id = '.Config::me('uidNumber').' ) = 0 limit 1', true ); 
+
+                        if( empty( $slot ) ) 
+                        { 
+                                throw new Exception('Nenhum slot disponivel.'); 
+                        } 
+
+                        $params['id'] = $slot['id']; 
+        }
 }