diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index e280eef..d578e54 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,10 +5,16 @@
+
+ uses
+
+
+ uses
+
uses
-
+
uses
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 0ddc935..1ea2f3f 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -3,6 +3,7 @@
component="org.gcube.portlets-user.workspace-portlet.6-23-0"
date="${buildDate}">
[Task #17226] Removing HL
+ [Task #17524] Hiding 'Add Administrator" on VRE Folders
>() {
+ GWT.log("Updating ACL info for folder id: "+toParentACL.getIdentifier());
+ WorkspaceSharingServiceAsync.INSTANCE.getUserACLForFolderId(toParentACL.getIdentifier(), new AsyncCallback>() {
@Override
public void onFailure(Throwable arg0) {
// TODO Auto-generated method stub
+ GWT.log("Failed: "+arg0);
}
@Override
public void onSuccess(List res) {
FileModel parent = wsPortlet.getToolBarPath().getLastParent();
- ConstantsExplorer.log("Validating correct ACL id: "+parentId +" and "+parent.getIdentifier());
- if(parentId.compareTo(parent.getIdentifier())==0){
+ GWT.log("Validating correct ACL id: "+toParentACL.getIdentifier() +" and "+parent.getIdentifier());
+ if(toParentACL.getIdentifier().compareTo(parent.getIdentifier())==0){
if(res!=null && res.size()>0){
wsPortlet.getToolBarItemDetails().updateACLInfo(res.get(0));
- wsPortlet.getToolBarItemDetails().updateAddAdministatorInfo(AppControllerExplorer.myLogin, res.get(0));
+
+ //see Task #17524
+ if(!parent.isVreFolder())
+ wsPortlet.getToolBarItemDetails().updateAddAdministatorInfo(AppControllerExplorer.myLogin, res.get(0));
}
}
}
@@ -1897,16 +1901,16 @@ public class AppController implements SubscriberInterface {
* @see org.gcube.portlets.user.workspace.client.interfaces.SubscriberInterface#updatedVREPermissions(java.lang.String)
*/
@Override
- public void updatedVREPermissions(String vreFolderId) {
+ public void updatedVREPermissions(FileModel vreFolder) {
GxtBreadcrumbPathPanel breadCrumb = this.wsPortlet.getToolBarPath();
FileModel parent = breadCrumb.getLastParent();
if(parent!=null)
- GWT.log("UpdatedVREPermissions comparing "+vreFolderId +" and "+parent.getIdentifier());
+ GWT.log("UpdatedVREPermissions comparing "+vreFolder.getIdentifier() +" and "+parent.getIdentifier());
//IF VRE FOLDER (UPDATED) IS CURRENT BREADCRUMB DISPLAING -> UPDATE
- if(vreFolderId!=null && parent!=null && vreFolderId.compareToIgnoreCase(parent.getIdentifier())==0){
- setACLInfo(vreFolderId);
+ if(vreFolder.getIdentifier()!=null && parent!=null && vreFolder.getIdentifier().compareToIgnoreCase(parent.getIdentifier())==0){
+ setACLInfo(vreFolder);
}
}