Changeset 6023

Timestamp:

04/25/12 10:33:45 (12 years ago)

Author:

marcieli

Message:

Ticket #2633 - Ao criar novo marcador, duplica na lista da tela de configuração

Location:

trunk/prototype

Files:

• api/controller.php (modified) (1 diff)
• config/label.ini (modified) (1 diff)
• modules/mail/js/label.js (modified) (1 diff)
• services/PostgreSQL.php (modified) (1 diff)

trunk/prototype/api/controller.php

@@ -536 +536 @@
                         case 'deleteAll': $return = $params['service']->deleteAll( $params['URI'], $params['properties'], $params['criteria'] ); break;
 
-                        case 'update': $return = $params['service']->update( $params['URI'], $params['properties']/*, $criteria*/ ); break;
+                        case 'update': $return = $params['service']->update( $params['URI'], $params['properties'], $params['criteria'] ); break;
 
                         case 'replace': $return = $params['service']->replace( $params['URI'], $params['properties'], $params['criteria'] ); break;

trunk/prototype/config/label.ini

@@ -13 +13 @@
 
 [before.update]
+addVerifyOwnerFilter = modules/mail/interceptors/LabelSecure.php
 verifyNameLabel = modules/mail/interceptors/Helpers.php
 

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

@@ -262 +262 @@
         $(".add-label-button").removeClass("ui-icon ui-icon-plus")
         .html('<img alt="Carregando" title="Carregando" style="margin-left:10px;" src="../prototype/modules/mail/img/loader.gif" />');
-        
+        var hasLabel = true;
+        var labelId;
         DataLayer.commit(false, false, function(data){
-                var hasLabel = true;
                 $.each(data, function(index, value) {
                         if(typeof value == 'object'){
                                 hasLabel = false;
+                                labelId = value.id;
                         }else{
                                 hasLabel = value;
                         }
                 });
+        
                 if(!hasLabel){
-                        labels = DataLayer.get('label',{criteria:{order: 'id'}}, true);
                         newLabel = {
-                                id: labels[labels.length - 1].id, 
-                                name : labels[labels.length- 1].name,
+                                id: labelId, 
+                                name : nameLabel.trim(),
                                 uid: User.me.id,
                                 bgColor : !!isNew ? '#ebebeb' : winElement.find("input[name='backgroundColor']").val(),
                                 fontColor : !!isNew ? '#000000' : winElement.find("input[name='fontColor']").val(),
                                 borderColor : !!isNew ? '#000000' : winElement.find("input[name='borderColor']").val()
-                                
                         };
                 

trunk/prototype/services/PostgreSQL.php

@@ -45 +45 @@
     }
                 
-    public function update ( $uri,  $data ){
+    public function update ( $uri,  $data, $criteria = false ){
             $map = Config::get($uri['concept'], 'PostgreSQL.mapping');
-            return $this->execSql('UPDATE '.(Config::get($uri['concept'],'PostgreSQL.concept')).' '. self::parseUpdateData( $data ,$map).' WHERE id = \''. addslashes( $uri['id']) .'\'');
+            $criteria = ($criteria !== false) ? $this->parseCriteria ( $criteria , $map , ' WHERE '.$map['id'].' = \''.addslashes( $uri['id'] ).'\'') : ' WHERE '.$map['id'].' = \''.addslashes( $uri['id'] ).'\'';
+            return $this->execSql('UPDATE '.(Config::get($uri['concept'],'PostgreSQL.concept')).' '. self::parseUpdateData( $data ,$map).$criteria);
     }