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

updated description in history 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@79580 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2013-07-23 18:05:08 +00:00
parent bcd383060d
commit 309af54ca5
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java
View File

@ -116,9 +116,9 @@ public class AccoutingInfoContainer extends LayoutContainer {
return Resources.getIconCancel().createImage();
else if(model.get(OPERATION).equals(GxtAccountingEntryType.RENAME))
return Resources.getIconRenameItem().createImage();
else if(model.get(OPERATION).equals(GxtAccountingEntryType.UPDATED))
else if(model.get(OPERATION).equals(GxtAccountingEntryType.UPDATE))
return Resources.getIconRefresh().createImage();
else if(model.get(OPERATION).equals(GxtAccountingEntryType.ADDED))
else if(model.get(OPERATION).equals(GxtAccountingEntryType.ADD))
return Resources.getIconFileUpload().createImage();
}
return null;

19
src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java
View File

@ -27,6 +27,7 @@ import org.gcube.portlets.user.homelibrary.home.workspace.accounting.AccountingE
import org.gcube.portlets.user.homelibrary.home.workspace.accounting.AccountingEntryRead;
import org.gcube.portlets.user.homelibrary.home.workspace.accounting.AccountingEntryRemoval;
import org.gcube.portlets.user.homelibrary.home.workspace.accounting.AccountingEntryRenaming;
import org.gcube.portlets.user.homelibrary.home.workspace.accounting.AccountingEntryUpdate;
import org.gcube.portlets.user.homelibrary.home.workspace.folder.FolderBulkCreator;
import org.gcube.portlets.user.homelibrary.home.workspace.folder.FolderItem;
import org.gcube.portlets.user.homelibrary.home.workspace.folder.items.AquaMapsItem;
@ -1765,7 +1766,7 @@ public class GWTWorkspaceBuilder {
AccountingEntryPaste paste = (AccountingEntryPaste) accountingEntry;
af.setDescription(GxtAccountingEntryType.PASTE.getName() +" by "+user.getName() +" from path: "+paste.getFromPath());
af.setDescription(GxtAccountingEntryType.PASTE.getName() + " from "+paste.getFromPath()+" by "+user.getName());
}
break;
@ -1790,31 +1791,31 @@ public class GWTWorkspaceBuilder {
AccountingEntryRenaming ren = (AccountingEntryRenaming) accountingEntry;
af.setDescription(GxtAccountingEntryType.RENAME.getName()+ " by "+user.getName() +", last name: "+ren.getOldItemName());
af.setDescription(GxtAccountingEntryType.RENAME.getName()+" from "+ren.getOldItemName() + " by "+user.getName());
}
break;
case ADD:
if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.ADDED)){
if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.ADD)){
af.setOperation(GxtAccountingEntryType.ADDED);
af.setOperation(GxtAccountingEntryType.ADD);
AccountingEntryAdd acc = (AccountingEntryAdd) accountingEntry;
af.setDescription(GxtAccountingEntryType.ADDED.getName()+ " by "+user.getName());
af.setDescription(GxtAccountingEntryType.ADD.getName()+ " " +acc.getItemName() + " by "+user.getName());
}
break;
case UPDATE:
if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.UPDATED)){
if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.UPDATE)){
af.setOperation(GxtAccountingEntryType.UPDATED);
af.setOperation(GxtAccountingEntryType.UPDATE);
// AccountingEntryUpdate acc = (AccountingEntryUpdate) accountingEntry;
AccountingEntryUpdate acc = (AccountingEntryUpdate) accountingEntry;
af.setDescription(GxtAccountingEntryType.UPDATED.getName()+ " by "+user.getName());
af.setDescription(GxtAccountingEntryType.UPDATE.getName()+ " "+acc.getItemName() +" by "+user.getName());
}
break;
}

4
src/main/java/org/gcube/portlets/user/workspace/shared/accounting/GxtAccountingEntryType.java
View File

@ -22,9 +22,9 @@ public enum GxtAccountingEntryType {
READ("read", "Read"),
ADDED("added", "Added"),
ADD("added", "Added"),
UPDATED("updated", "Updated"),
UPDATE("updated", "Updated"),
ALLWITHOUTREAD("all", "all");