From fa8d28899e836ac34ce5842d8519397e9d42c71c Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 8 Jul 2014 16:41:53 +0000
Subject: [PATCH] updated to manage add administrators
 https://support.social.isti.cnr.it/ticket/126

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@98506 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../user/workspace/WorkspaceTree.gwt.xml      |   1 +
 .../client/AppControllerExplorer.java         | 123 +++++++++++++++++-
 .../client/constant/WorkspaceOperation.java   |  34 +----
 .../client/event/AddAdministratorEvent.java   |  48 +++++++
 .../event/AddAdministratorEventHandler.java   |  17 +++
 .../client/interfaces/EventsTypeEnum.java     |   3 +-
 .../workspace/client/resources/Icons.java     |   3 +
 .../workspace/client/resources/Resources.java |  10 +-
 .../client/resources/icons/add_admin.png      | Bin 0 -> 933 bytes
 .../client/rpc/GWTWorkspaceService.java       |   3 +
 .../client/rpc/GWTWorkspaceServiceAsync.java  |   3 +
 .../client/util/GetPermissionIconByACL.java   |  15 +++
 .../client/view/tree/ContextMenuTree.java     |  25 +++-
 .../server/GWTWorkspaceServiceImpl.java       |  35 +++++
 14 files changed, 280 insertions(+), 40 deletions(-)
 create mode 100644 src/main/java/org/gcube/portlets/user/workspace/client/event/AddAdministratorEvent.java
 create mode 100644 src/main/java/org/gcube/portlets/user/workspace/client/event/AddAdministratorEventHandler.java
 create mode 100644 src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/add_admin.png

diff --git a/src/main/java/org/gcube/portlets/user/workspace/WorkspaceTree.gwt.xml b/src/main/java/org/gcube/portlets/user/workspace/WorkspaceTree.gwt.xml
index ab67650..3a26388 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/WorkspaceTree.gwt.xml
+++ b/src/main/java/org/gcube/portlets/user/workspace/WorkspaceTree.gwt.xml
@@ -11,6 +11,7 @@
   <!-- Moduel GXT -->
   <inherits name='com.extjs.gxt.ui.GXT'/>
   
+  <inherits name="org.gcube.portlets.widgets.workspacesharingwidget.WorkspaceSharingWidget" />
   
   <servlet path="/WorkspaceService" class="org.gcube.portlets.user.workspace.server.GWTWorkspaceServiceImpl" />
   <!--  
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
index 634572f..5b38dec 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
@@ -10,6 +10,8 @@ import org.gcube.portlets.user.workspace.client.event.AccountingHistoryEvent;
 import org.gcube.portlets.user.workspace.client.event.AccountingHistoryEventHandler;
 import org.gcube.portlets.user.workspace.client.event.AccountingReadersEvent;
 import org.gcube.portlets.user.workspace.client.event.AccountingReadersEventHandler;
+import org.gcube.portlets.user.workspace.client.event.AddAdministratorEvent;
+import org.gcube.portlets.user.workspace.client.event.AddAdministratorEventHandler;
 import org.gcube.portlets.user.workspace.client.event.AddFolderEvent;
 import org.gcube.portlets.user.workspace.client.event.AddFolderEventHandler;
 import org.gcube.portlets.user.workspace.client.event.AddSmartFolderEvent;
@@ -101,6 +103,7 @@ import org.gcube.portlets.user.workspace.client.interfaces.SubscriberInterface;
 import org.gcube.portlets.user.workspace.client.interfaces.TreeAppControllerInterface;
 import org.gcube.portlets.user.workspace.client.model.FileModel;
 import org.gcube.portlets.user.workspace.client.model.FolderModel;
+import org.gcube.portlets.user.workspace.client.model.InfoContactModel;
 import org.gcube.portlets.user.workspace.client.model.MessageModel;
 import org.gcube.portlets.user.workspace.client.model.SmartFolderModel;
 import org.gcube.portlets.user.workspace.client.model.SubTree;
@@ -140,6 +143,11 @@ import org.gcube.portlets.widgets.fileupload.client.events.FileUploadCompleteEve
 import org.gcube.portlets.widgets.fileupload.client.events.FileUploadCompleteEventHandler;
 import org.gcube.portlets.widgets.fileupload.client.events.FileUploadSelectedEvent;
 import org.gcube.portlets.widgets.fileupload.client.events.FileUploadSelectedEventHandler;
+import org.gcube.portlets.widgets.workspacesharingwidget.client.SmartConstants;
+import org.gcube.portlets.widgets.workspacesharingwidget.client.WorkspaceSmartSharingController;
+import org.gcube.portlets.widgets.workspacesharingwidget.client.view.sharing.SmartShare;
+import org.gcube.portlets.widgets.workspacesharingwidget.shared.CredentialModel;
+import org.gcube.vomanagement.usermanagement.ws.ListUsers;
 
 import com.extjs.gxt.ui.client.Registry;
 import com.extjs.gxt.ui.client.event.BaseEvent;
@@ -148,6 +156,7 @@ import com.extjs.gxt.ui.client.event.Listener;
 import com.extjs.gxt.ui.client.event.MessageBoxEvent;
 import com.extjs.gxt.ui.client.widget.Dialog;
 import com.extjs.gxt.ui.client.widget.Info;
+import com.extjs.gxt.ui.client.widget.MessageBox;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.shared.EventHandler;
 import com.google.gwt.event.shared.HandlerManager;
@@ -271,6 +280,45 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
 			}
 		});
 		
+		eventBus.addHandler(AddAdministratorEvent.TYPE, new AddAdministratorEventHandler() {
+			
+			@Override
+			public void onAddAdministrator(AddAdministratorEvent addAdministratorEvent) {
+				
+				final FileModel file = addAdministratorEvent.getSelectedFolder();
+				
+				if(file==null || file.getIdentifier()==null)
+					return;
+				
+				rpcWorkspaceService.getOwnerByItemId(file.getIdentifier(), new AsyncCallback<InfoContactModel>() {
+
+					@Override
+					public void onFailure(Throwable caught) {
+						
+						if(caught instanceof SessionExpiredException){
+							GWT.log("Session expired");
+							eventBus.fireEvent(new SessionExpiredEvent());
+							return;
+						}
+
+						new MessageBoxAlert("Error", "Sorry, an error occurred on recovering the contacts, try again later", null);
+						explorerPanel.unmask();
+					}
+
+					@Override
+					public void onSuccess(InfoContactModel infoContactModel) {
+
+						//IF IS OWNER
+						if(AppControllerExplorer.myLogin.compareToIgnoreCase(infoContactModel.getLogin())==0)
+							showAddAdministratorsDialog(file);
+						else
+							new MessageBoxAlert("Permission denied", "You have no permissions to add administrators. You are not manager of \""+file.getName()+"\"", null);
+						
+					}
+				});
+			}
+		});
+		
 		eventBus.addHandler(GetInfoEvent.TYPE, new GetInfoEventHandler() {
 
 			@Override
@@ -576,8 +624,6 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
 				boolean isLoading = BulkCreatorWindow.getInstance().addProgressBar(bulkCreatorEvent.getListBulks());
 
 				explorerPanel.setLoadingBulk(isLoading);
-
-
 			}
 		});
 
@@ -596,7 +642,6 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
 
 				GWT.log("PasteItemEvent is fired on : "+pasteItemEvent.getIds().size()+ "items, DestinationId: "+pasteItemEvent.getFolderDestinationId());
 				doCutCopyAndPaste(pasteItemEvent);
-
 			}
 
 			private void doCutCopyAndPaste(final PasteItemEvent pasteItemEvent) {
@@ -2109,6 +2154,78 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
 		return this.explorerPanel;
 	}
 	
+	/**
+	 * 
+	 * @param file
+	 * @param showAlert
+	 */
+	private void showAddAdministratorsDialog(final FileModel file) {
+
+		org.gcube.portlets.widgets.workspacesharingwidget.shared.FileModel internalFile = new org.gcube.portlets.widgets.workspacesharingwidget.shared.FileModel(file.getIdentifier(), file.getName(), file.isDirectory());
+		
+		WorkspaceSmartSharingController controller = new WorkspaceSmartSharingController(internalFile, null, false, false);
+		
+		SmartConstants.HEADER_TITLE = "Add Administrators to: "+file.getName();
+		SmartConstants.SHARE_WITH_USERS = "Manage with users";
+		SmartConstants.ERROR_NO_USER_SELECTED = "You must pick at least one user to add to Administrators";
+		
+		final SmartShare sharingWindow = controller.getSharingDialog();
+
+		sharingWindow.getButtonById(Dialog.OK).addListener(Events.Select, new Listener<BaseEvent>() {
+			 
+			@Override
+			public void handleEvent(BaseEvent be) {
+ 
+				if(sharingWindow.isValidForm(true)){
+					//THAT'S OK
+ 
+					List<org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel> listUsers = sharingWindow.getSharedListUsers(); //@return the selected contacts (as InfoContactModel)
+ 
+					if(listUsers!=null && listUsers.size()>0){
+						
+						List<String> logins = new ArrayList<String>(listUsers.size());
+						
+						for (org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel infoContactModel : listUsers) {
+							logins.add(infoContactModel.getLogin());
+						}
+						
+						doAddAdministratorToFolderId(file, logins);
+					}
+				}
+ 
+			}
+		});
+		
+		
+		sharingWindow.show();
+		
+	}
+	
+	
+	private void doAddAdministratorToFolderId(final FileModel file, final List<String> logins) {
+		
+		rpcWorkspaceService.addAdministratorsByFolderId(file.getIdentifier(), logins, new AsyncCallback<Boolean>() {
+
+			@Override
+			public void onFailure(Throwable arg0) {
+				new MessageBoxAlert("Error", arg0.getMessage(), null);
+			}
+
+			@Override
+			public void onSuccess(Boolean arg0) {
+				String title = "Added";
+				
+				String admin = logins.size()>1?"administrators":"administrator";
+				title += " "+admin;
+				
+				String msg =  logins.size() + " "+admin +" added correctly to "+file.getName();
+				
+				MessageBox.info(title, msg, null);
+				
+			}
+		});
+	}
+	
 	private void loadMyLogin(){
 		
 		rpcWorkspaceService.getMyLogin(new AsyncCallback<String>() {
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/constant/WorkspaceOperation.java b/src/main/java/org/gcube/portlets/user/workspace/client/constant/WorkspaceOperation.java
index 1804d92..930e566 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/constant/WorkspaceOperation.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/constant/WorkspaceOperation.java
@@ -34,39 +34,9 @@ public enum WorkspaceOperation {
 	ACCREAD("ACR", "ACR"), //ACCOUNTING READ
 	SHARE_LINK("SLK", "SLK"), //SHARE URL LINK
 	PUBLIC_LINK("PLK", "PLK"), //PUBLIC LINK
-	VRE_CHANGE_PERIMISSIONS("CHP", "CHP"); 
+	VRE_CHANGE_PERIMISSIONS("CHP", "CHP"),
+	ADD_ADMINISTRATOR("AAD", "AAD"); // ADD_ADMINISTRATOR
 	
-	
-//	//ID CONTEXT MENU
-//	public static final String INS = "INS"; //Insert Folder
-//	public static final String ADD = "ADD";
-//	public static final String REM = "REM";
-//	public static final String UPL = "UPL"; //Upload File
-//	public static final String DWL = "DWL";
-//	public static final String PRW = "PRW";
-//	public static final String RNM = "RNM";
-//	public static final String ISHF = "ASHF"; //Insert shared Folder
-//	public static final String SHR = "SHR"; //SHARE
-//	public static final String USHR = "USHR"; //UNSHARE
-//	public static final String UPA = "UPA"; //Upload Archive
-//	public static final String LNK = "LNK"; 
-//	public static final String SHW = "SHW";
-//	public static final String CLK = "CLK"; //Add Url
-//	public static final String ORT = "ORT";	//Open report template
-//	public static final String ORP = "ORP"; //Open report
-//	public static final String SDT = "SDT"; //Send to
-//	public static final String DWM = "DWN"; //Get all new messages
-//	public static final String MKR = "MKR"; //Mark as read
-//	public static final String MKNR = "MKNR"; //Mark as not read
-//	public static final String DLM = "DLM"; //Delete message
-//	public static final String FWM = "FWM"; //Forward message
-//	public static final String CPI = "CPI"; //copy item
-//	public static final String PSI = "PSI"; //paste
-//	public static final String RFH = "RFH"; //Refresh
-//	public static final String WDV = "WDV"; //WebDav
-//	public static final String CNM = "CNM"; //Create new message
-//	public static final String GTI = "GTI"; //GET INFO
-
 	private String id; // ID CONTEXT MENU
 	private String name;
 
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/AddAdministratorEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/event/AddAdministratorEvent.java
new file mode 100644
index 0000000..5885cbe
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/event/AddAdministratorEvent.java
@@ -0,0 +1,48 @@
+package org.gcube.portlets.user.workspace.client.event;
+
+import org.gcube.portlets.user.workspace.client.interfaces.EventsTypeEnum;
+import org.gcube.portlets.user.workspace.client.interfaces.GuiEventInterface;
+import org.gcube.portlets.user.workspace.client.model.FileModel;
+
+import com.google.gwt.event.shared.GwtEvent;
+
+/**
+ * 
+ * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
+ * @Jul 8, 2014
+ *
+ */
+public class AddAdministratorEvent extends GwtEvent<AddAdministratorEventHandler> implements GuiEventInterface{
+	public static Type<AddAdministratorEventHandler> TYPE = new Type<AddAdministratorEventHandler>();
+	
+
+	private FileModel folder;
+
+
+	public AddAdministratorEvent(FileModel folder) {
+		this.folder = folder;
+	}
+
+
+	@Override
+	public Type<AddAdministratorEventHandler> getAssociatedType() {
+		return TYPE;
+	}
+
+	@Override
+	protected void dispatch(AddAdministratorEventHandler handler) {
+		handler.onAddAdministrator(this);
+		
+	}
+
+	@Override
+	public EventsTypeEnum getKey() {
+		return EventsTypeEnum.ADD_ADMINISTRATOR_EVENT;
+	}
+
+
+	public FileModel getSelectedFolder() {
+		return folder;
+	}
+
+}
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/AddAdministratorEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/event/AddAdministratorEventHandler.java
new file mode 100644
index 0000000..ac58938
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/event/AddAdministratorEventHandler.java
@@ -0,0 +1,17 @@
+package org.gcube.portlets.user.workspace.client.event;
+
+import com.google.gwt.event.shared.EventHandler;
+
+/**
+ * 
+ * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
+ * @Jul 8, 2014
+ *
+ */
+public interface AddAdministratorEventHandler extends EventHandler {
+
+	/**
+	 * @param addAdministratorEvent
+	 */
+	void onAddAdministrator(AddAdministratorEvent addAdministratorEvent);
+}
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/interfaces/EventsTypeEnum.java b/src/main/java/org/gcube/portlets/user/workspace/client/interfaces/EventsTypeEnum.java
index 74cdbec..b252c80 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/interfaces/EventsTypeEnum.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/interfaces/EventsTypeEnum.java
@@ -31,5 +31,6 @@ public enum EventsTypeEnum
    PASTED_EVENT, 
    COPY_EVENT,
    TRASH_EVENT, 
-   UPDATED_VRE_PERMISSION;
+   UPDATED_VRE_PERMISSION, 
+   ADD_ADMINISTRATOR_EVENT;
 }
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/Icons.java b/src/main/java/org/gcube/portlets/user/workspace/client/resources/Icons.java
index bc62690..98fe8d9 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/resources/Icons.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/resources/Icons.java
@@ -310,6 +310,9 @@ public interface Icons extends ClientBundle {
 	@Source("icons/admin.png")
 	ImageResource administrator();
 	
+	@Source("icons/add_admin.png")
+	ImageResource addAdmin();
+	
 	@Source("icons/specialfolder2.png")
 	ImageResource specialFolder();
 	
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/Resources.java b/src/main/java/org/gcube/portlets/user/workspace/client/resources/Resources.java
index 0660d5d..81fa851 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/resources/Resources.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/resources/Resources.java
@@ -519,6 +519,13 @@ public class Resources {
 	public static AbstractImagePrototype getSelectedRight() {
 		return AbstractImagePrototype.create(ICONS.selectedRight());
 	}
+	
+	/**
+	 * @return
+	 */
+	public static AbstractImagePrototype getIconAddAdministrator() {
+		return AbstractImagePrototype.create(ICONS.addAdmin());
+	}
 
 	//ImageResources
 	public static ImageResource getImagePathSeparator(){
@@ -664,8 +671,5 @@ public class Resources {
 //		System.out.println("extensions - "+extension);
 		return Resources.getIconByExtension(extension);
 	}
-
-
-
 	
 }
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/add_admin.png b/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/add_admin.png
new file mode 100644
index 0000000000000000000000000000000000000000..a554089f015dc553cc4eb8f1da786db0f7e10027
GIT binary patch
literal 933
zcmV;W16urvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^w=
z3^NnzyZ(v*00SjSL_t(I%U#k-Xj}yt#qs~WbMMS#GHEiMCTUC)8BJpPBCRn{MJQS*
zt<p`Qi&jK@R0P45E~-#<AyuJnjoG+t6j4wR#oE+1(F!59>6oOGM=_0=nM`u$&ilUR
ze(qw^Z-0J=1E0bJcl{NDdUWR}JDxakx+yUb*Hv3xU;L~3(~s9CKWbeb&Bl0_ZG20d
zbG(f8V4mBb4o+0=-4GEG@yjBWlt})X`2UQ^dl&XrIZuJl80I1kfTG<Wp8BBc!$(e@
ze=4$TAGif@i<qSqmW*47U!mjh-iFY`Y{(A!JBe|CQS2>1toQL38d~D8F$-!Ce3#3s
zW1O2B!B!kxy^h`DtH3cT9KePxfaNP8#m+!o1w{wnqb1<7JJyb)dgPT7IlF|^#P$Qs
zpdx|$fuV<tq5eHR`?Y|MZx!*qGTmw;$D8+XEYd^VEAq3tjBCj6v~mWQOIv_!>uWcn
zYW9u3Hdn8Uk5hNC>?%$%hqZE(-_lvGbYxvRxlEoPI74-FLg$;(-g}Tscj|KuGv*jx
z_D_PIiGsyiu8i3-z*6WW?f&P=`a(M5J(=-0o8zY|k+Z{2a(ccf$puHI*G0Y_Ta>HM
z9F#x0b@}p(?_~IIk*hNzbIT$Zze+iQ*wd#rfq}PbAAf(-mZ_zZ6l`DemdJX|k?EIS
zmFth~mxW|X3|GYSL>4lZOs<L?e|=;P0_`e5UzfZnK`2O=yQad12Zm{~O;dQdV>{){
z8hHiA(>WH33b`r_9eKW0k3M=<0|+%LZ8=-R5|xq%VGq=FnS@~wEEdS5R#+Q^WX`0R
zkCJEuCE7wLx?@lS$dz;qPo-!>g9ZTwn(r*KdvOkZaUOGK7Ap@Szn7W=h6|apg6m39
z14vGcFC_*K_r)ThRY4Uf>z$;x_mD2D%<mdNHb86$H$%pQ$%%Pv^X`%YK=kO*t|M=M
zv+ucQo8lb-B4N-PL3Ld`r;gSf#;-ulf`S35@mtJ}zLTn(znoD1f1^ad9`AoY+I{Fy
zq&40YjD!P9NK@5-idZgg&5^2MI^}<pd298`ulVT;z`g$f+ya&o1bQoc00000NkvXX
Hu0mjfBTlNo

literal 0
HcmV?d00001

diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java
index bba3aac..dfadfff 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java
@@ -252,4 +252,7 @@ public interface GWTWorkspaceService extends RemoteService{
 	TrashOperationContent executeOperationOnTrash(List<String> listTrashItemIds,
 			WorkspaceTrashOperation operation) throws Exception;
 
+	boolean addAdministratorsByFolderId(String folderId,
+			List<String> listContactIds) throws Exception;
+
 }
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java
index 3bdbc1c..ba09411 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java
@@ -203,5 +203,8 @@ public interface GWTWorkspaceServiceAsync {
 	void executeOperationOnTrash(List<String> listTrashItemIds,
 			WorkspaceTrashOperation operation,
 			AsyncCallback<TrashOperationContent> callback);
+	
+	void addAdministratorsByFolderId(String folderId, List<String> listLogins,
+			AsyncCallback<Boolean> callback);
 
 }
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/util/GetPermissionIconByACL.java b/src/main/java/org/gcube/portlets/user/workspace/client/util/GetPermissionIconByACL.java
index 9904c01..3a8d0f8 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/util/GetPermissionIconByACL.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/util/GetPermissionIconByACL.java
@@ -5,6 +5,7 @@ package org.gcube.portlets.user.workspace.client.util;
 
 import org.gcube.portlets.user.workspace.client.resources.Resources;
 import org.gcube.portlets.user.workspace.shared.WorkspaceACL;
+import org.gcube.portlets.user.workspace.shared.WorkspaceACL.USER_TYPE;
 
 import com.google.gwt.user.client.ui.AbstractImagePrototype;
 
@@ -34,5 +35,19 @@ public class GetPermissionIconByACL {
 
 		return null;
 	}
+	
+	public static AbstractImagePrototype getImage(WorkspaceACL.USER_TYPE userType) {
+
+		if(userType==null)
+			return null;
+		
+		if (userType.equals(USER_TYPE.ADMINISTRATOR)) {
+			return Resources.getIconAdministrator();
+		} else if (userType.equals(USER_TYPE.GROUP)) {
+			return Resources.getIconUsers();
+		}
+
+		return null;
+	}
 
 }
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java
index 28003d0..671706f 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java
@@ -8,6 +8,7 @@ import org.gcube.portlets.user.workspace.client.ConstantsExplorer;
 import org.gcube.portlets.user.workspace.client.constant.WorkspaceOperation;
 import org.gcube.portlets.user.workspace.client.event.AccountingHistoryEvent;
 import org.gcube.portlets.user.workspace.client.event.AccountingReadersEvent;
+import org.gcube.portlets.user.workspace.client.event.AddAdministratorEvent;
 import org.gcube.portlets.user.workspace.client.event.AddFolderEvent;
 import org.gcube.portlets.user.workspace.client.event.CopytemEvent;
 import org.gcube.portlets.user.workspace.client.event.CreateSharedFolderEvent;
@@ -583,6 +584,25 @@ public class ContextMenuTree {
 		contextMenu.add(changePermission); 
 		
 		contextMenu.add(new SeparatorMenuItem());
+		
+		
+		MenuItem addAdministrator = new MenuItem();  
+		addAdministrator.setId(WorkspaceOperation.ADD_ADMINISTRATOR.getId());
+		addAdministrator.setText("Add Administrator/s");  
+		addAdministrator.setIcon(Resources.getIconAddAdministrator());  
+
+		addAdministrator.addSelectionListener(new SelectionListener<MenuEvent>() {  
+			public void componentSelected(MenuEvent ce) { 
+
+				for (FileModel sel : listSelectedItems) {  
+					eventBus.fireEvent(new AddAdministratorEvent(sel));  
+				}  
+			}  
+		}); 
+		
+		contextMenu.add(addAdministrator); 
+		
+		
 
 		MenuItem refreshItem = new MenuItem();  
 		refreshItem.setId(WorkspaceOperation.REFRESH_FOLDER.getId());
@@ -709,7 +729,8 @@ public class ContextMenuTree {
 		contextMenu.getItemByItemId(WorkspaceOperation.PASTE.getId()).setEnabled(false); //paste
 		contextMenu.getItemByItemId(WorkspaceOperation.REFRESH_FOLDER.getId()).setVisible(false); //refresh
 		contextMenu.getItemByItemId(WorkspaceOperation.PUBLIC_LINK.getId()).setVisible(false); //public link
-
+		contextMenu.getItemByItemId(WorkspaceOperation.ADD_ADMINISTRATOR.getId()).setVisible(false); //public link
+		
 		contextMenu.getItemByItemId(WorkspaceOperation.SHARE.getId()).setVisible(false); //SHARE
 		contextMenu.getItemByItemId(WorkspaceOperation.UNSHARE.getId()).setVisible(false); //UNSHARE
 		
@@ -776,6 +797,8 @@ public class ContextMenuTree {
 			contextMenu.getItemByItemId(WorkspaceOperation.SENDTO.getId()).setVisible(false); //send to
 			if(selectedItem.isShared()){//IS SHARED
 				
+				contextMenu.getItemByItemId(WorkspaceOperation.ADD_ADMINISTRATOR.getId()).setVisible(true); //add administrator
+				
 				if(selectedItem.isShareable()){ //IS SHARABLE
 					contextMenu.getItemByItemId(WorkspaceOperation.INSERT_SHARED_FOLDER.getId()).setVisible(false); //insert shared folder
 					contextMenu.getItemByItemId(WorkspaceOperation.UNSHARE.getId()).setVisible(true);
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
index baec3d2..5f18740 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
@@ -3032,5 +3032,40 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			throw new Exception(error);
 		}
 	}
+
+	/* (non-Javadoc)
+	 * @see org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceService#addAdministratorsByFolderId(java.lang.String, java.util.List)
+	 * 
+	 * true if administrators have been added, false otherwise
+	 */
+	@Override
+	public boolean addAdministratorsByFolderId(String folderId, List<String> listContactLogins) throws Exception {
+		if(folderId==null || listContactLogins==null || listContactLogins.size()==0)
+			return false;
+		try {
+			
+			Workspace workspace = getWorkspace();
+			WorkspaceItem item = workspace.getItem(folderId);
+			workspaceLogger.info("Adding administator/s to folder: "+folderId);
+			
+			if(item.getType().equals(WorkspaceItemType.SHARED_FOLDER)){
+				WorkspaceSharedFolder sharedFolder = (WorkspaceSharedFolder) item;
+				for (String login : listContactLogins) {
+					workspaceLogger.info("Setting administator: "+login);
+					sharedFolder.setAdmin(login);
+				}
+				return true;
+				
+			}else
+				throw new Exception("The item is not instanceof "+WorkspaceItemType.SHARED_FOLDER);
+			
+		} catch (Exception e) {
+			workspaceLogger.error("Error in server addAdministratorsByFolderId: "+e.getMessage());
+			workspaceLogger.error(e);
+			String error = ConstantsExplorer.SERVER_ERROR +" adding administrators, try again later";
+			throw new Exception(error);
+		}
+		
+	}
 	
 }