From 32476b16cc79f113be494f6bc755d47b89a2ab85 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Tue, 2 Sep 2014 14:31:46 -0400
Subject: [PATCH] applied comments and fix bug when tagging msgs already tagged

---
 UI/MailerUI/UIxMailFolderActions.m | 16 ++++++----------
 UI/WebServerResources/MailerUI.js  |  6 ++++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index 15fe69459..82e9b2006 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -635,11 +635,7 @@
   flags = [NSArray arrayWithObject:[content objectForKey:@"flags"]];
   msgUIDs = [NSArray arrayWithArray:[content objectForKey:@"msgUIDs"]];
   operation = [content objectForKey:@"operation"];
-  
-  if ([operation isEqualToString:@"add"])
-    addOrRemove = YES;
-  else
-    addOrRemove = NO;
+  addOrRemove = ([operation isEqualToString:@"add"]? YES: NO);
 
   co = [self clientObject];
   client = [[co imap4Connection] client];
@@ -648,7 +644,7 @@
   if ([[[[result objectForKey:@"RawResponse"] objectForKey:@"ResponseResult"] objectForKey:@"description"] isEqualToString:@"Completed"])
     response = [self responseWith204];
   else
-    response = nil;
+    response = [self responseWithStatus:500 andJSONRepresentation:result];
 
   return response;
 }
@@ -674,16 +670,16 @@
   co = [self clientObject];
   v = [[[context activeUser] userDefaults] mailLabelsColors];
   [flags addObjectsFromArray: [v allKeys]];
-  
+
   client = [[co imap4Connection] client];
   [[co imap4Connection] selectFolder: [co imap4URL]];
   result = [client storeFlags:flags forUIDs:msgUIDs addOrRemove:NO];
-  
+
   if ([[[[result objectForKey:@"RawResponse"] objectForKey:@"ResponseResult"] objectForKey:@"description"] isEqualToString:@"Completed"])
     response = [self responseWith204];
   else
-    response = nil;
-  
+    response = [self responseWithStatus:500 andJSONRepresentation:result];
+
   return response;
 }
 
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 0a53b005d..67735a16b 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -2550,8 +2550,10 @@ function messageFlagCallback(http) {
                     var flags = [];
                     if (labels.length > 0)
                         flags = labels.split(" ");
-                    if (operation == "add")
-                        flags.push(data["flag"]);
+                    if (operation == "add") {
+                        if (flags.indexOf(data["flag"]) == -1)
+                            flags.push(data["flag"]);
+                    }
                     else {
                         // Remove flag
                         var flag = data["flag"];