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

Task #8070: completed 

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

10
distro/changelog.xml
View File

@ -1,11 +1,17 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-17-0"
date="2017-04-12">
<Change>Task #8070: file versioning shown in a column of workspace grid</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-16-0" <Changeset component="org.gcube.portlets-user.workspace-portlet.6-16-0"
date="2017-03-03"> date="2017-03-03">
<Change>Removed accesslogger dependency</Change> <Change>Removed accesslogger dependency</Change>
<Change>[Task #6988] Fixed Edit administrator showing</Change> <Change>[Task #6988] Fixed Edit administrator showing</Change>
<Change>[Feature #7006] File Versioning</Change> <Change>[Feature #7006] File Versioning</Change>
<Change>Edit administrator can be performed also by other Administrator/s</Change> <Change>Edit administrator can be performed also by other
<Change>Edit permissions can be performed also by Administrators</Change> Administrator/s</Change>
<Change>Edit permissions can be performed also by Administrators
</Change>
</Changeset> </Changeset>
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-15-1" <Changeset component="org.gcube.portlets-user.workspace-portlet.6-15-1"
date="2017-02-02"> date="2017-02-02">

2
pom.xml
View File

@ -11,7 +11,7 @@
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>workspace</artifactId> <artifactId>workspace</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>6.16.0-SNAPSHOT</version> <version>6.17.0-SNAPSHOT</version>
<name>gCube Workspace Portlet</name> <name>gCube Workspace Portlet</name>
<description> <description>
gCube Workspace Portlet is a web-gui to manage the gCube workspace a collaborative area where users can exchange and organize information objects (workspace items) according to their specific needs. gCube Workspace Portlet is a web-gui to manage the gCube workspace a collaborative area where users can exchange and organize information objects (workspace items) according to their specific needs.

17
src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java
View File

@ -84,22 +84,23 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
setId("GxtGridFilterGroupPanel "+Random.nextInt()); setId("GxtGridFilterGroupPanel "+Random.nextInt());
ColumnConfig icon = new ColumnConfig(FileModel.ICON, "", 25); ColumnConfig icon = new ColumnConfig(FileModel.ICON, "", 25);
icon.setSortable(false); icon.setSortable(false);
ColumnConfig name = new ColumnConfig(FileGridModel.NAME, FileGridModel.NAME, 300); ColumnConfig name = new ColumnConfig(FileGridModel.NAME, FileGridModel.NAME, 280);
ColumnConfig type = new ColumnConfig(FileGridModel.TYPE, FileGridModel.TYPE, 50); ColumnConfig type = new ColumnConfig(FileGridModel.TYPE, FileGridModel.TYPE, 60);
ColumnConfig lastUpdate = new ColumnConfig(FileGridModel.LASTMODIFIED, "Last Update", 100); ColumnConfig lastUpdate = new ColumnConfig(FileGridModel.LASTMODIFIED, "Last Update", 90);
lastUpdate.setDateTimeFormat(DateTimeFormat.getFormat("dd MMM hh:mm aaa yyyy")); lastUpdate.setDateTimeFormat(DateTimeFormat.getFormat("dd MMM hh:mm aaa yyyy"));
ColumnConfig category = new ColumnConfig(FileModel.HUMAN_REDABLE_CATEGORY, FileModel.HUMAN_REDABLE_CATEGORY, 100); ColumnConfig category = new ColumnConfig(FileModel.HUMAN_REDABLE_CATEGORY, FileModel.HUMAN_REDABLE_CATEGORY, 100);
ColumnConfig size = new ColumnConfig(FileGridModel.SIZE, FileGridModel.SIZE, 50); ColumnConfig size = new ColumnConfig(FileGridModel.SIZE, FileGridModel.SIZE, 45);
ColumnConfig ownerFullName = new ColumnConfig(FileGridModel.OWNERFULLNAME, FileGridModel.OWNER, 100); ColumnConfig ownerFullName = new ColumnConfig(FileGridModel.OWNERFULLNAME, FileGridModel.OWNER, 90);
ColumnConfig fileVersion = new ColumnConfig(FileGridModel.VERSION, FileGridModel.VERSION, 35);
size.setEditor(new CellEditor(new NumberField())); size.setEditor(new CellEditor(new NumberField()));
ColumnModel cm = null; ColumnModel cm = null;
if(group) if(group)
cm = new ColumnModel(Arrays.asList(icon, name, ownerFullName, type, lastUpdate, size, category)); cm = new ColumnModel(Arrays.asList(icon, name, fileVersion, ownerFullName, type, lastUpdate, size, category));
else else
cm = new ColumnModel(Arrays.asList(icon, name, ownerFullName, type, lastUpdate, size)); cm = new ColumnModel(Arrays.asList(icon, name, fileVersion, ownerFullName, type, lastUpdate, size));
final ColumnModel columnModel = cm; final ColumnModel columnModel = cm;
@ -163,10 +164,12 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
StringFilter nameFilter = new StringFilter(FileGridModel.NAME); StringFilter nameFilter = new StringFilter(FileGridModel.NAME);
StringFilter authorFilter = new StringFilter(FileGridModel.TYPE); StringFilter authorFilter = new StringFilter(FileGridModel.TYPE);
StringFilter versionFilter = new StringFilter(FileGridModel.VERSION);
DateFilter dateFilter = new DateFilter(FileGridModel.LASTMODIFIED); DateFilter dateFilter = new DateFilter(FileGridModel.LASTMODIFIED);
NumericFilter sizeFilter = new NumericFilter(FileGridModel.SIZE); NumericFilter sizeFilter = new NumericFilter(FileGridModel.SIZE);
filters.addFilter(nameFilter); filters.addFilter(nameFilter);
filters.addFilter(versionFilter);
filters.addFilter(authorFilter); filters.addFilter(authorFilter);
filters.addFilter(dateFilter); filters.addFilter(dateFilter);
filters.addFilter(sizeFilter); filters.addFilter(sizeFilter);