git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1415 d1b88da0-ebda-0310...

diff --git a/UI/Templates/GNUmakefile b/UI/Templates/GNUmakefile
index 1ad7f522ae95ba3fb1ad77399c16ee3f9db07b22..e2d7f2a80fffd27921f289acabace3a3c22fad6f 100644 (file)
--- a/UI/Templates/GNUmakefile
+++ b/UI/Templates/GNUmakefile
@@ -18,21 +18,22 @@ validate-wox:
        @for wox in $(WOXS); \
          do $(XMLLINT-BIN) --noout $$wox || exit 1; \
        done;
-
-mkinstall-dirs ::
-       @if [ ! -d $(SOGO_TEMPLATESDIR) ]; then mkdir -p $(SOGO_TEMPLATESDIR); fi 
-       @for dir in $(TEMPLATE_DIRS); do \
-         if [ ! -d $(SOGO_TEMPLATESDIR)/$$dir ]; then \
-           echo Creating template directory \"$(SOGO_TEMPLATESDIR)/$$dir\"...; \
-           mkdir $(SOGO_TEMPLATESDIR)/$$dir; \
-         fi; \
-       done
-
-install-files ::
-       @echo Installing template files...
-       @tar cf - $(WOXS) | ( cd $(SOGO_TEMPLATESDIR); tar xf -)
-
-install :: mkinstall-dirs install-files
+       @echo "Template files validated"
+
+install ::
+       @if [ -L "$(SOGO_TEMPLATESDIR)" ]; then \
+         echo "$(SOGO_TEMPLATESDIR) is a symbolic link (for development?). Installation skipped."; \
+       else \
+         if [ ! -d $(SOGO_TEMPLATESDIR) ]; then mkdir -p $(SOGO_TEMPLATESDIR); fi; \
+         for dir in $(TEMPLATE_DIRS); do \
+           if [ ! -d $(SOGO_TEMPLATESDIR)/$$dir ]; then \
+             echo Creating template directory \"$(SOGO_TEMPLATESDIR)/$$dir\"...; \
+             mkdir $(SOGO_TEMPLATESDIR)/$$dir; \
+           fi; \
+         done; \
+         echo Installing template files...; \
+         tar cf - $(WOXS) | ( cd $(SOGO_TEMPLATESDIR); tar xf -) ;\
+       fi
 
 clean ::
 

diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 4e3410519830694f8a333d2a62fb858d41777546..27a9aa2fcf5ab4c12728237ea13770a1c2930b20 100644 (file)
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -626,17 +626,18 @@ function onAddressBookRemove(event) {
   if (nodes.length > 0) {
     nodes[0].deselect();
     var owner = nodes[0].getAttribute("owner");
-    if (owner != UserLogin) {
-      var folderId = nodes[0].getAttribute("id");
-      unsubscribeFromFolder(folderId, owner, onFolderUnsubscribeCB, folderId);
-    }
-    else {
+    if (owner == UserLogin) {
+      var folderIdElements = nodes[0].getAttribute("id").split(":");
       var abId = folderIdElements[0].substr(1);
       deletePersonalAddressBook(abId);
       var personal = $("/personal");
       personal.selectElement();
       onFolderSelectionChange();
     }
+    else {
+      var folderId = nodes[0].getAttribute("id").substr("1");
+      unsubscribeFromFolder(folderId, owner, onFolderUnsubscribeCB, folderId);
+    }
   }
 
   preventDefault(event);
@@ -650,7 +651,7 @@ function deletePersonalAddressBook(folderId) {
       document.deletePersonalABAjaxRequest.aborted = true;
       document.deletePersonalABAjaxRequest.abort();
     }
-    var url = ApplicationBaseURL + "/" + folderId + "/deleteFolder";
+    var url = ApplicationBaseURL + folderId + "/deleteFolder";
     document.deletePersonalABAjaxRequest
       = triggerAjaxRequest(url, deletePersonalAddressBookCallback,
                           folderId);

diff --git a/UI/WebServerResources/GNUmakefile b/UI/WebServerResources/GNUmakefile
index 2085dccf91b35e0c86a7f5f367422b5af03a690f..b2e166e744e152393e162b977ff16bab1889aca1 100644 (file)
--- a/UI/WebServerResources/GNUmakefile
+++ b/UI/WebServerResources/GNUmakefile
@@ -7,8 +7,12 @@ WEBSERVER_RESOURCE_FILES = $(shell ls *css *ico *js *.jpg *gif *png *html *txt)
 all ::
 
 install ::
-       @mkdir -p ${SOGO_WEBSERVERRESOURCESDIR}
-       @cp $(WEBSERVER_RESOURCE_FILES) ${SOGO_WEBSERVERRESOURCESDIR}
+       @if [ -L "$(SOGO_WEBSERVERRESOURCESDIR)" ]; then \
+         echo "$(SOGO_WEBSERVERRESOURCESDIR) is a symbolic link (for development?). Installation skipped."; \
+       else \
+         mkdir -p $(SOGO_WEBSERVERRESOURCESDIR); \
+         cp $(WEBSERVER_RESOURCE_FILES) $(SOGO_WEBSERVERRESOURCESDIR); \
+       fi
 
 clean ::