From 5c291627a4209c6e16b6eeaf05a98fe6f73b90f0 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 11 Aug 2010 17:23:59 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 89320b31db49181dce46dc16f17984d806609750 Monotone-Revision: 3567e5aef4045091a835f8185e4f1ff94e748c78 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2010-08-11T17:23:59 --- ChangeLog | 3 +++ UI/Common/UIxAclEditor.m | 2 +- UI/Common/UIxObjectActions.m | 2 +- UI/WebServerResources/UIxAclEditor.js | 9 +++++++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e78f0b166..7b28e7d09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ * SOPE/NGCards/iCalRecurrenceRule.m Modified setInterval: so that when the value is equal to 1, we do NOT set it. + * UI/WebServerResources/UIxAclEditor.js + In addUserCallback(), we remove the owner of the + resource if it was added. 2010-08-03 Ludovic Marcotte diff --git a/UI/Common/UIxAclEditor.m b/UI/Common/UIxAclEditor.m index 0eadb9f02..e825a8bcd 100644 --- a/UI/Common/UIxAclEditor.m +++ b/UI/Common/UIxAclEditor.m @@ -1,6 +1,6 @@ /* UIxAclEditor.m - this file is part of SOGo * - * Copyright (C) 2006-2009 Inverse inc. + * Copyright (C) 2006-2010 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/UIxObjectActions.m b/UI/Common/UIxObjectActions.m index 4a6c540ac..ba76d2a0e 100644 --- a/UI/Common/UIxObjectActions.m +++ b/UI/Common/UIxObjectActions.m @@ -1,6 +1,6 @@ /* UIxObjectActions.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse inc. + * Copyright (C) 2007-2010 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/WebServerResources/UIxAclEditor.js b/UI/WebServerResources/UIxAclEditor.js index ecd76c4e7..f206abcf6 100644 --- a/UI/WebServerResources/UIxAclEditor.js +++ b/UI/WebServerResources/UIxAclEditor.js @@ -36,14 +36,19 @@ function addUser(userName, userID) { var elements = url.split("/"); elements[elements.length-1] = ("addUserInAcls?uid=" + userID); - triggerAjaxRequest(elements.join("/"), addUserCallback); + triggerAjaxRequest(elements.join("/"), addUserCallback, newNode); result = true; } return result; } function addUserCallback(http) { - // Ignore response + if (http.readyState == 4) { + if (!isHttpStatus204(http.status)) { + var node = http.callbackData; + node.parentNode.removeChild(node); + } + } } function setEventsOnUserNode(node) {