Changeset 6013

Timestamp:

04/24/12 14:59:22 (12 years ago)

Author:

marcieli

Message:

Ticket #2633 - Ao atualizar marcador, não é necessário controlar limite de slot.

Location:

trunk/prototype

Files:

• config/label.ini (modified) (1 diff)
• modules/mail/interceptors/Helpers.php (modified) (2 diffs)
• modules/mail/js/label.js (modified) (3 diffs)

trunk/prototype/config/label.ini

@@ -13 +13 @@
 
 [before.update]
-validateLabel = modules/mail/interceptors/Helpers.php
+verifyNameLabel = modules/mail/interceptors/Helpers.php
 
 [before.create]
-validateLabel = modules/mail/interceptors/Helpers.php
+verifyNameLabel = modules/mail/interceptors/Helpers.php
+validateNumberSlots = modules/mail/interceptors/Helpers.php
 
 [PostgreSQL.mapping]

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

@@ -337 +337 @@
                 }       
         }       
-
         //label:before.create 
-        public function validateLabel(&$uri , &$params , &$criteria , $original){ 
-
+        public function verifyNameLabel(&$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.'); 
-                        } 
+                                throw new Exception('#LabelNameError'); 
+                        }
+        }
+
+        //label:before.create 
+        public function validateNumberSlots(&$uri , &$params , &$criteria , $original){ 
 
                         $used = Controller::read( array( 'concept' => 'label', 'id' => '1' ), array( 'id' ), array( 'uid' => Config::me('uidNumber') ) );
@@ -358 +361 @@
                         if( empty( $slot ) ) 
                         { 
-                                throw new Exception('Atingido limite de marcadores criados.'); 
+                                throw new Exception('#LabelSlotError'); 
                         } 
 

trunk/prototype/modules/mail/js/label.js

@@ +1 @@
+function msgCallback(msg){
+        switch(msg){
+                case '#LabelNameError': 
+                        alert('Já existe um marcador com esse nome.');
+                        break;
+                case '#LabelSlotError':
+                        alert('Atingido limite de marcadores criados.');
+                        break;  
+                default:
+                        alert('Ocorreu um erro ao salvar o Marcador');
+        }
+}
 function configureLabel(event, ui){
         var idmarkernow = $(this).find('[name="labelItemId"]').val();
@@ -170 +182 @@
                                                 loadMenu();
                                         }else{
-                                                alert(hasLabel);
+                                                msgCallback(hasLabel);
                                         }
                                         
@@ -314 +326 @@
                         $(".add-label-button").empty()
                         .addClass("ui-icon ui-icon-plus");
-                        alert(hasLabel);
+                        msgCallback(hasLabel);
                 }
         });