From 3ad7a345cc07262d5c120e883c20ed625f2b5be8 Mon Sep 17 00:00:00 2001
From: Claudio Barril <claudiobarril@gmail.com>
Date: Sat, 11 Apr 2015 16:09:29 -0300
Subject: [PATCH 1/2] take away collaboration from collabsToRemove before role
 edition

---
 .../java/com/wisemapping/rest/MindmapController.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
index 4c9bbeed..778e31a6 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
@@ -412,17 +412,17 @@ public class MindmapController extends BaseController {
                 throw new IllegalArgumentException(roleStr + " is not a valid role");
             }
 
+            // Remove from the list of pendings to remove ...
+            if (collaboration != null) {
+                collabsToRemove.remove(collaboration);
+            }
+
             // Is owner ?
             final CollaborationRole role = CollaborationRole.valueOf(roleStr.toUpperCase());
             if (role != CollaborationRole.OWNER) {
                 mindmapService.addCollaboration(mindMap, restCollab.getEmail(), role, restCollabs.getMessage());
             }
 
-            // Remove from the list of pendings to remove ...
-            if (collaboration != null) {
-                collabsToRemove.remove(collaboration);
-            }
-
         }
 
         // Remove all collaborations that no applies anymore ..

From 13b3c307c72429ac11bdd15c8b78a025e40d4fff Mon Sep 17 00:00:00 2001
From: Claudio Barril <claudiobarril@gmail.com>
Date: Sat, 11 Apr 2015 16:09:55 -0300
Subject: [PATCH 2/2] sort collabs by id

---
 .../java/com/wisemapping/rest/model/RestCollaboration.java  | 6 ++++++
 wise-webapp/src/main/webapp/jsp/mindmapShare.jsp            | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaboration.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaboration.java
index 47c4724f..38a965bb 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaboration.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaboration.java
@@ -37,10 +37,12 @@ import javax.xml.bind.annotation.XmlRootElement;
         isGetterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY)
 public class RestCollaboration {
 
+    private long id;
     private String email;
     private String role;
 
     public RestCollaboration(@NotNull Collaboration collaboration) {
+        this.id = collaboration.getId();
         this.email = collaboration.getCollaborator().getEmail();
         this.role = collaboration.getRole().getLabel();
     }
@@ -59,6 +61,10 @@ public class RestCollaboration {
 
     }
 
+    public long getId() {
+        return id;
+    }
+
     public String getRole() {
         return role;
     }
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp b/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp
index 0148b725..7b0eff2e 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp
@@ -192,7 +192,7 @@ $(function () {
         success:function (data, textStatus, jqXHR) {
             // Owner roles is the first in the table ...
             var collabs = data.collaborations.sort(function (a, b) {
-                return a.role <= b.role;
+                return a.id > b.id;
             });
 
             // Add all the columns in the table ...