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

removed mark as read method according to HL 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@112334 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2015-03-03 16:15:32 +00:00
parent badff07973
commit 8b99dc02e5
3 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.tern-project Normal file
View File

@ -0,0 +1 @@
{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]}

27
src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
View File

@ -422,15 +422,6 @@ public class AppController implements SubscriberInterface {
public void onFileDownloadEvent(FileDownloadEvent fileDownloadEvent) { public void onFileDownloadEvent(FileDownloadEvent fileDownloadEvent) {
if(fileDownloadEvent!=null && fileDownloadEvent.getItemIdentifier()!=null){ if(fileDownloadEvent!=null && fileDownloadEvent.getItemIdentifier()!=null){
// FileGridModel fileItem = getGridSelectedItem();
//
// String id = fileDownloadEvent.getItemIdentifier()!=null? fileDownloadEvent.getItemIdentifier():"";
//
// if(fileItem!=null && id.compareTo(fileItem.getIdentifier())==0){
// fileItem.setMarkAsRead(true);
// accountingSetItemAsRead(true);
// }
AppControllerExplorer.getEventBus().fireEvent(new FileDownloadEvent(fileDownloadEvent.getItemIdentifier(), fileDownloadEvent.getItemName(), fileDownloadEvent.getDownloadType())); AppControllerExplorer.getEventBus().fireEvent(new FileDownloadEvent(fileDownloadEvent.getItemIdentifier(), fileDownloadEvent.getItemName(), fileDownloadEvent.getDownloadType()));
} }
@ -463,11 +454,6 @@ public class AppController implements SubscriberInterface {
if(!event.isMultiSelection()){ //IS NOT MULTISELECTION if(!event.isMultiSelection()){ //IS NOT MULTISELECTION
doElementGridSelected(true, event.getSourceFile()); doElementGridSelected(true, event.getSourceFile());
//REMOVED IS MARK AS READ FROM HL - 2015/02/24
// FileGridModel fileItem = getGridSelectedItem();
// if(fileItem!=null){
// accountingSetItemAsRead(fileItem.isMarkAsRead());
// }
}else{ //IS MULTISELECTION }else{ //IS MULTISELECTION
wsPortlet.getGxtCardLayoutResultPanel().getToolBarItemFunctionalities().activeButtonForMultiSelection(true); wsPortlet.getGxtCardLayoutResultPanel().getToolBarItemFunctionalities().activeButtonForMultiSelection(true);
@ -970,10 +956,10 @@ public class AppController implements SubscriberInterface {
}); });
} }
/*
private void accountingSetItemAsRead(boolean read) { private void accountingSetItemAsRead(boolean read) {
wsPortlet.getToolBarItemDetails().setRead(read); wsPortlet.getToolBarItemDetails().setRead(read);
} }*/
private void doElementGridSelected(boolean isSelected, FileModel target) { private void doElementGridSelected(boolean isSelected, FileModel target) {
@ -1640,14 +1626,11 @@ public class AppController implements SubscriberInterface {
FileGridModel fileItem = wsPortlet.getGridGroupContainer().getFileGridModelByIdentifier(itemIdentifier); FileGridModel fileItem = wsPortlet.getGridGroupContainer().getFileGridModelByIdentifier(itemIdentifier);
if(fileItem!=null && itemIdentifier!= null && fileItem.getIdentifier().compareTo(itemIdentifier)==0){ if(fileItem!=null && itemIdentifier!= null && fileItem.getIdentifier().compareTo(itemIdentifier)==0){
//REMOVED FROM HL
// fileItem.setMarkAsRead(true);
//SET ICON AS READ IF ITEM IS SELECETED IN THE GRID //SET ICON AS READ IF ITEM IS SELECETED IN THE GRID
FileGridModel fileSelected = getGridSelectedItem(); // FileGridModel fileSelected = getGridSelectedItem();
if(fileSelected!=null && fileSelected.getIdentifier().compareTo(itemIdentifier)==0) // if(fileSelected!=null && fileSelected.getIdentifier().compareTo(itemIdentifier)==0)
accountingSetItemAsRead(true); // accountingSetItemAsRead(true);
} }
} }

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

@ -209,17 +209,17 @@ public class GxtBottomToolBarItem extends ToolBar{
} }
/** // /**
* @param markAsRead // * @param markAsRead
*/ // */
public void setRead(boolean markAsRead) { // public void setRead(boolean markAsRead) {
if(markAsRead) // if(markAsRead)
bRead.setIcon(Resources.getIconRead()); // bRead.setIcon(Resources.getIconRead());
else // else
bRead.setIcon(Resources.getIconNotRead()); // bRead.setIcon(Resources.getIconNotRead());
//
bRead.setEnabled(markAsRead); // bRead.setEnabled(markAsRead);
} // }
public void updateACLInfo(WorkspaceACL acl){ public void updateACLInfo(WorkspaceACL acl){