gCubeSystem
/
workspace
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added a fix for versioning 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@144455 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2017-03-01 10:19:56 +00:00
parent 539b127d10
commit e5b5e6fc14
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtBottomToolBarItem.java
View File

@ -228,7 +228,7 @@ public class GxtBottomToolBarItem extends ToolBar{
btnVersioning.setEnabled(false);
if(target!=null){
GXTFolderItemTypeEnum category = target.getGXTFolderItemType();
if(category!=null && (category.equals(GXTFolderItemTypeEnum.EXTERNAL_FILE) || category.equals(GXTFolderItemTypeEnum.EXTERNAL_IMAGE) || category.equals(GXTFolderItemTypeEnum.EXTERNAL_IMAGE)))
if(category!=null && (category.equals(GXTFolderItemTypeEnum.EXTERNAL_PDF_FILE) || category.equals(GXTFolderItemTypeEnum.EXTERNAL_FILE) || category.equals(GXTFolderItemTypeEnum.EXTERNAL_IMAGE)))
btnVersioning.setEnabled(enable);
}
}

15
src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtToolBarItemFunctionality.java
View File

@ -775,14 +775,6 @@ public class GxtToolBarItemFunctionality {
this.btnOpen.disable();
this.btnCopyItem.disable();
this.btnCutItem.disable();
//ADDED 07/03/2104
// this.btnAddFolder.disable();
// this.btnUploadArchive.disable();
// this.btnUploadFile.disable();
// this.btnGetInfo.disable();
// this.btnGetSharedLink.disable();
} else {
this.btnRemoveItem.enable();
this.btnRenameItem.enable();
@ -790,13 +782,6 @@ public class GxtToolBarItemFunctionality {
this.btnOpen.enable();
this.btnCopyItem.enable();
this.btnCutItem.enable();
//ADDED 07/03/2104
// this.btnAddFolder.enable();
// this.btnUploadArchive.enable();
// this.btnUploadFile.enable();
// this.btnGetInfo.enable();
}
}

23
src/main/java/org/gcube/portlets/user/workspace/client/view/versioning/VersioningInfoContainer.java
View File

@ -281,11 +281,8 @@ public class VersioningInfoContainer extends LayoutContainer {
//ColumnConfig deleteDate = createSortableColumnConfig(FileTrashedModel.STOREINFO.DELETEDATE.toString(), "Deleted Date", 90);
//deleteDate.setDateTimeFormat(DateTimeFormat.getFormat("dd MMM hh:mm aaa yyyy"));
ColumnConfig user = createSortableColumnConfig(FileVersionModel.USER_VERSIONING, "User", 130);
ColumnConfig currVersion = createSortableColumnConfig(FileVersionModel.IS_CURRENT_VERSION, "Current Version", 80);
//ColumnModel cm = new ColumnModel(Arrays.asList(icon, name, type, originalPath, deleteDate, deleteUser));
ColumnModel cm = new ColumnModel(Arrays.asList(name, created, user, currVersion));
grid = new Grid<FileVersionModel>(this.store, cm);
@ -324,7 +321,27 @@ public class VersioningInfoContainer extends LayoutContainer {
}
};
GridCellRenderer<FileVersionModel> currVersionRender = new GridCellRenderer<FileVersionModel>() {
@Override
public String render(FileVersionModel model, String property, ColumnData config, int rowIndex, int colIndex, ListStore<FileVersionModel> store, Grid<FileVersionModel> grid) {
Boolean isCurrVersion = model.isCurrentVersion();
String val = model.get(property);
String color = "black";
if(val!=null && isCurrVersion != null && isCurrVersion){
// color = "#EEC900";
return "<span qtitle='This is current version' qtip='" + val + ">Yes</span>";
}else{
if(val==null)
val = "";
return "<span qtitle='This is a previous version' qtip='" + val + "' style='color:" + color + "'>No</span>";
}
}
};
name.setRenderer(nameRender);
currVersion.setRenderer(currVersionRender);
filters.addFilter(nameFilter);
filters.addFilter(dateFilter);
filters.addFilter(userFilter);