Changeset 5890 for trunk/prototype/modules/mail

Timestamp:

04/05/12 17:27:34 (12 years ago)

Author:

marcieli

Message:

Ticket #2593 - Tratamento para nome de marcador case sensitive e com espaços.

Location:

trunk/prototype/modules/mail

Files:

• interceptors/Helpers.php (modified) (1 diff)
• js/followupflag.js (modified) (2 diffs)
• js/label.js (modified) (2 diffs)

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

@@ -303 +303 @@
         public function verifyNameLabel(&$uri , &$params , &$criteria , $original){
                 $nameLabel = $params['name'];
-                $Labels = Controller::find(array('concept' => 'label'), false, array('filter' => array('=', 'name', $nameLabel) ));
+                $Labels = Controller::find(array('concept' => 'label'), false, array('filter' => array('i=', 'name', $nameLabel) ));
                 if($Labels){
                         //Throw new Exception('Marcador existe');

trunk/prototype/modules/mail/js/followupflag.js

@@ -416 +416 @@
  * constrói as duas possíveis janela de alerta, utilizando o mesmo template
  */
-function alarmFollowupflaged(){
+function alarmFollowupflagged(){
     $('.followupflag-alarm').remove();
 
@@ -512 +512 @@
 
 $('#main_table').ready(function(){
-    alarmFollowupflaged();
+    alarmFollowupflagged();
 });

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

@@ -108 +108 @@
                                 id : winElement.find(".edit-label").val(),
                                 uid: User.me.id,
-                                name : winElement.find('.input-nome').val(),
+                                name : winElement.find('.input-nome').val().trim(),
                                 backgroundColor : winElement.find("input[name='backgroundColor']").val(),
                                 fontColor : winElement.find("input[name='fontColor']").val(),
@@ -231 +231 @@
         var labelCreated = {
                 uid: User.me.id,
-                name : nameLabel,
+                name : nameLabel.trim(),
                 backgroundColor : !!isNew ? '#ebebeb' : winElement.find("input[name='backgroundColor']").val(),
                 fontColor : !!isNew ? '#000000' : winElement.find("input[name='fontColor']").val(),