#19544 updated the unsharing messages in the accounting history

task/19600
Francesco Mangiacrapa 4 years ago
parent 297226343c
commit 8cd11d782c

@ -4,7 +4,15 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v6-30-0] [r4-23-0] - 2020-05-18
## [v6.30.1] [r4.24.0] - 2020-06-25
**Fixes**
[Task #19544] update the unsharing messages in the accounting history
## [v6.30.0] [r4.23.0] - 2020-05-18
**New Features** **New Features**
@ -17,7 +25,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
[#19243] Fixed upload archive facility does not work properly with Windows OS [#19243] Fixed upload archive facility does not work properly with Windows OS
## [v6-29-0] [r4.21.0] - 2020-03-27 ## [v6.29.0] [r4.21.0] - 2020-03-27
**New Features** **New Features**
@ -34,22 +42,19 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
[#18926] Workspace portlet: previous version file download errors [#18926] Workspace portlet: previous version file download errors
## [6.28.1] - ${buildDate}
## [6-28-1] - 2020-02-03
Migrated to git Migrated to git
## [6.28.0] - ${buildDate}
## [6-28-0] - [${buildDate}]
Merged with branch version Merged with branch version
Changed shared folder check to send notification Changed shared folder check to send notification
## [6.27.0] - ${buildDate}
## [6-27-0] - [${buildDate}]
[Task #17226] Workspace and Workspace Tree: migrate HL remaining methods to SHUB [Task #17226] Workspace and Workspace Tree: migrate HL remaining methods to SHUB
@ -58,22 +63,19 @@ Updated the list of classes shared with sharing widget component
[Task #17552] Workspace: reconsider the actions Private Link, Folder Link and Get Link [Task #17552] Workspace: reconsider the actions Private Link, Folder Link and Get Link
## [6.26.0] - ${buildDate}
## [6-26-0] - [${buildDate}]
[Task #17135] Workspace: assign the file extension during the download [Task #17135] Workspace: assign the file extension during the download
[Feature #17091] Reconsider error message when deleting a shared folder [Feature #17091] Reconsider error message when deleting a shared folder
## [6.25.1] - ${buildDate}
## [6-25-1] - [${buildDate}]
[Task #17018] Move some methods to SHUB due to backward compatibility broken between SHUB and HL [Task #17018] Move some methods to SHUB due to backward compatibility broken between SHUB and HL
## [6.25.0] - ${buildDate}
## [6-25-0] - [${buildDate}]
Updated to StorageHub [ticket: #13226] Updated to StorageHub [ticket: #13226]
@ -82,8 +84,7 @@ Updated to StorageHub [ticket: #13226]
[Task #12910] Rename and delete operations on shared folder should be managed by dedicated message on WS-side [Task #12910] Rename and delete operations on shared folder should be managed by dedicated message on WS-side
## [6.24.1] - ${buildDate}
## [6-24-1] - [${buildDate}]
Updated regular expression to validate Folder and File names Updated regular expression to validate Folder and File names
@ -92,8 +93,7 @@ Updated regular expression to validate Folder and File names
[Task #13106] Provide public links for versioned files [Task #13106] Provide public links for versioned files
## [6.23.0] - ${buildDate}
## [6-23-0] - [${buildDate}]
[Task #12521] Migrate the tree view [Task #12521] Migrate the tree view
@ -120,82 +120,70 @@ Updated regular expression to validate Folder and File names
[Incident #12922] Workspace get link not working [Incident #12922] Workspace get link not working
## [6.22.0] - 2018-09-14
## [6-22-0] - [2018-09-14]
[Task #12489] Migrate delete operation to StorageHub [Task #12489] Migrate delete operation to StorageHub
integrated CLARIN Switchboard with service endpoint query for Switchboard service discovery integrated CLARIN Switchboard with service endpoint query for Switchboard service discovery
## [6.21.1] - 2018-07-02
## [6-21-1] - [2018-07-02]
[Task #12089] Migrate to workspace-uploader 2.0 [Task #12089] Migrate to workspace-uploader 2.0
[Release #12006] Removed Send to [Release #12006] Removed Send to
## [6.21.0] - 2018-06-07
## [6-21-0] - [2018-06-07]
[Project Activity #11690] Integrated with Task Executor Widget [Project Activity #11690] Integrated with Task Executor Widget
## [6.20.1] - 2018-04-19
## [6-20-1] - [2018-04-19]
Managed case of Exception in order to avoid failure on checkItemLocked Managed case of Exception in order to avoid failure on checkItemLocked
## [6.20.0] - 2018-03-01
## [6-20-0] - [2018-03-01]
[Task #11127] Porting to new ws-thredds engine [Task #11127] Porting to new ws-thredds engine
[Feature #11325] Workspace: add New URL feature in the context menu of right pane [Feature #11325] Workspace: add New URL feature in the context menu of right pane
## [6.19.0] - 2018-01-09
## [6-19-0] - [2018-01-09]
Issue #10831, Workspace download folder tomcat temp occupation issue Issue #10831, Workspace download folder tomcat temp occupation issue
## [6.18.0] - 2017-09-29
## [6-18-0] - [2017-09-29]
Feature #9760: WS-Thredds synch folder integration Feature #9760: WS-Thredds synch folder integration
## [6.17.2] - 2017-09-13
## [6-17-2] - [2017-09-13]
Incident #9676: fixed. Removed check on get sub-folder public link when operation is performed by an administrator Incident #9676: fixed. Removed check on get sub-folder public link when operation is performed by an administrator
## [6.17.1] - 2017-07-10
## [6-17-1] - [2017-07-10]
Added regex in order to remove list of chars when renaming or creating new item. It is different for folder and item name Added regex in order to remove list of chars when renaming or creating new item. It is different for folder and item name
## [6.17.0] - 2017-05-22
## [6-17-0] - [2017-05-22]
[Feature #5207] Integrate Image Preview Widget [Feature #5207] Integrate Image Preview Widget
## [6.16.1] - 2017-04-11
## [6-16-1] - [2017-04-11]
Quick fix to set folder as public Quick fix to set folder as public
Updated messages to history including version of file if it is present Updated messages to history including version of file if it is present
## [6.16.0] - 2017-03-03
## [6-16-0] - [2017-03-03]
Removed no longer used dependency: accesslogger Removed no longer used dependency: accesslogger
@ -208,30 +196,26 @@ Edit Administrator can be performed by other Administrator/s
'Edit Permissions' can be performed by Administrators 'Edit Permissions' can be performed by Administrators
## [6.15.2] - 2016-01-20
## [6-15-2] - [2016-01-20]
Added a loader on share window when contacts are loading from server Added a loader on share window when contacts are loading from server
Removed currUserId parameter from client side required for external servlets Removed currUserId parameter from client side required for external servlets
## [6.15.1] - 2016-01-05
## [6-15-1] - [2016-01-05]
Removed message box shown in case of failure on getAllContatcs Removed message box shown in case of failure on getAllContatcs
## [6.15.0] - 2016-11-29
## [6-15-0] - [2016-11-29]
[Feature #5873] Remove ASL Session from the Workspace and its components [Feature #5873] Remove ASL Session from the Workspace and its components
Updated logic to get Folder Link (as Public folder). The access is granted for owner or admin Updated logic to get Folder Link (as Public folder). The access is granted for owner or admin
## [6.14.0] - 2016-09-29
## [6-14-0] - [2016-09-29]
[Feature #2335] Added "Get Folder Link" facility [Feature #2335] Added "Get Folder Link" facility
@ -246,44 +230,38 @@ Added 'gcube-url-shortener' dependency, removed internal classes for shortener
[Bug #5218] Fixed return to the Workspace root Folder [Bug #5218] Fixed return to the Workspace root Folder
## [6.13.0] - 2016-05-31
## [6-13-0] - [2016-05-31]
[Feature #4128] Migration to Liferay 6.2 [Feature #4128] Migration to Liferay 6.2
Data Catalogue publishing supported Data Catalogue publishing supported
## [6.12.0] - 2016-05-16
## [6-12-0] - [2016-05-16]
Integrated with new workspace uploader Integrated with new workspace uploader
Bug fixed: Css for Dialog Cancel multiple files Bug fixed: Css for Dialog Cancel multiple files
## [6.11.1] - 2016-02-24
## [6-11-1] - [2016-02-24]
Added icons for: .odt, .ods, .ott, .odg, .odp Added icons for: .odt, .ods, .ott, .odg, .odp
## [6.11.0] - 2016-01-20
## [6-11-0] - [2016-01-20]
[Feature #1925] Added, new public link format: http://host/storageID [Feature #1925] Added, new public link format: http://host/storageID
[Feature #1298] Update public link generation [Feature #1298] Update public link generation
## [6.10.1] - 2015-12-16
## [6-10-1] - [2015-12-16]
Bug Fixing - #1804; #1808; #1822; #1333 Bug Fixing - #1804; #1808; #1822; #1333
## [6.10.0] - 2015-11-19
## [6-10-0] - [2015-11-19]
[Feature #124] Remove a user from shared folder [Feature #124] Remove a user from shared folder
@ -296,8 +274,7 @@ Bug Fixing - #1804; #1808; #1822; #1333
[Bug: #1459] Fixed: get link disabled [Bug: #1459] Fixed: get link disabled
## [6.9.0] - 2015-10-30
## [6-9-0] - [2015-10-30]
[Bug #718] Fixed breadcrumb path [Bug #718] Fixed breadcrumb path
@ -310,94 +287,82 @@ Bug Fixing - #1804; #1808; #1822; #1333
[Bug #1270] Fixed. Workspace improvements: many rpc calls after an delete multiple [Bug #1270] Fixed. Workspace improvements: many rpc calls after an delete multiple
## [6.8.0] - 2015-07-06
## [6-8-0] - [2015-07-06]
[Feature #129] Porting to HL 2.0 [Feature #129] Porting to HL 2.0
[Feature #331] Public Link updated to show short link and complete link [Feature #331] Public Link updated to show short link and complete link
## [6.7.2] - 2015-04-15
## [6-7-2] - [2015-04-15]
Integrated with Contact Edit Permissions Integrated with Contact Edit Permissions
## [6.7.1] - 2014-10-29
## [6-7-1] - [2014-10-29]
Added user storage usage Added user storage usage
Added notifications for: set folder Administrator, delete shared folder Added notifications for: set folder Administrator, delete shared folder
## [6.6.7] - 2014-09-01
## [6-6-7] - [2014-09-01]
Support Ticket #813: Broken Breadcrumb for long path Support Ticket #813: Broken Breadcrumb for long path
Ticket #3053: Load current ACL stored to Shared Folder Ticket #3053: Load current ACL stored to Shared Folder
## [6.6.6] - 2014-07-02
## [6-6-6] - [2014-07-02] [#2798] Sharing Panel usability improved
#2798 Sharing Panel usability improved
Completed activity to https://support.social.isti.cnr.it/ticket/126 Completed activity to https://support.social.isti.cnr.it/ticket/126
## [6.6.5] - 2014-06-04
## [6-6-5] - [2014-06-04]
Added Trash: https://issue.imarine.research-infrastructures.eu/ticket/2497 Added Trash: https://issue.imarine.research-infrastructures.eu/ticket/2497
Updated pom to support new portal configuration (gcube release 3.2) Updated pom to support new portal configuration (gcube release 3.2)
## [6.6.4] - 2014-05-22
## [6-6-4] - [2014-05-22]
Fixed: https://support.d4science.research-infrastructures.eu/ticket/843 Fixed: https://support.d4science.research-infrastructures.eu/ticket/843
Added: item number in grid and trash. See: https://issue.imarine.research-infrastructures.eu/ticket/282 Added: item number in grid and trash. See: https://issue.imarine.research-infrastructures.eu/ticket/282
## [6.6.2] - 2014-3-17
## [6-6-2] - [2014-3-17]
Management of My Special Folder Management of My Special Folder
Added change permissions to VRE shared folder Added change permissions to VRE shared folder
## [6.6.0] - 2014-2-07
## [6-6-0] - [2014-2-07] [#2634] Workspace: support for setting permissions over shared folders
#2634 Workspace: support for setting permissions over shared folders
#2633 Workspace: support for VRE Shared Folders [#2633] Workspace: support for VRE Shared Folders
#2290 Worskspace history operations: should support the session validation [#2290] Worskspace history operations: should support the session validation
## [6.5.1] - 2013-12-12
## [6-5-1] - [2013-12-12]
Changed several labels into Logger Changed several labels into Logger
## [6.5.0] - 2013-10-21
## [6-5-0] - [2013-10-21]
#Ticket 2223. This project was enhancements to gwt 2.5.1 #Ticket 2223. This project was enhancements to gwt 2.5.1
GCF dependency was removed GCF dependency was removed
## [6.4.0] - 2013-09-16
## [6-4-0] - [2013-09-16]
Provide support for public link, Related ticket: #1993 Provide support for public link, Related ticket: #1993
@ -406,8 +371,7 @@ Link sharing and public link: generate a human-readable URL via URL shortening,
Fixed bug on shared links, Ticket #630 Fixed bug on shared links, Ticket #630
## [6.3.0] - 2013-07-08
## [6-3-0] - [2013-07-08]
Provide support for share link, Related ticket: #1504 Provide support for share link, Related ticket: #1504
@ -416,100 +380,87 @@ Edit description on sharing, Related ticket: #1822
Bugs fixed, Related Tickets: #628, #633, #630 Bugs fixed, Related Tickets: #628, #633, #630
## [6.2.0] - 2013-05-29
## [6-2-0] - [2013-05-29]
Provide support for accounting, related ticket: #1752 Provide support for accounting, related ticket: #1752
Enable notification for file upload in shared folder, related ticket: #1732 Enable notification for file upload in shared folder, related ticket: #1732
## [6.1.0] - 2013-04-19
## [6-1-0] - [2013-04-19]
Workspace portlet was enhanced to meet the requests coming from the User Community Workspace portlet was enhanced to meet the requests coming from the User Community
Related tickets: #1500, #1498, #320, #1487, #1499, #1501, #1497, #1536 Related tickets: #1500, #1498, #320, #1487, #1499, #1501, #1497, #1536
## [6.0.0] - 2013-03-05
## [6-0-0] - [2013-03-05] [#1247] The workspace tree was mavenized
#1247 The workspace tree was mavenized
#230, #205 The Workspace environment now supports the sharing of folder between users [#230], [#205] The Workspace environment now supports the sharing of folder between users
## [5.1.0] - 2012-09-21
## [5-1-0] - [2012-09-21]
Old Send Message removed, added support for new mail sender Old Send Message removed, added support for new mail sender
Bug fixed: upload file/archive Bug fixed: upload file/archive
## [5.0.0] - 2012-05-04
## [5-0-0] - [2012-05-04] [#216] New version of Workspace Tree is developed using the GXT framework
#216 New version of Workspace Tree is developed using the GXT framework
#216 New tree is asynchronous [#216] New tree is asynchronous
#216 Reviews tree GUI and adding new features [#216] Reviews tree GUI and adding new features
## [4.3.0] - 2011-09-01
## [4-3-0] - [2011-09-01] [#1740]: ICIS / Download csv / added extension .xlw
#1740: ICIS / Download csv / added extension .xlw
## [4.2.0] - 2011-07-01
[#1555]: WorkflowTemplate and WorkflowReport required in Workspace Portlet
## [4-2-0] - [2011-07-01]
#1555: WorkflowTemplate and WorkflowReport required in Workspace Portlet ## [4.1.0] - 2011-05-06
## [4-1-0] - [2011-05-06]
Synch with others changes in HomeLibrary Synch with others changes in HomeLibrary
GWT 2.2.0 GWT 2.2.0
## [4.0.0] - 2011-02-07
## [4-0-0] - [2011-02-07]
Removed Workspace and Basket type, replaced with folder option Removed Workspace and Basket type, replaced with folder option
Synch with others changes in HomeLibrary Synch with others changes in HomeLibrary
## [3.2.1] - 2010-11-09
## [3-2-1] - [2010-11-09]
Added more checks on GWT model construction Added more checks on GWT model construction
## [3.2.0] - 2010-10-22
## [3-2-0] - [2010-10-22]
Enabled details panel for Report, ReportTemplate and AquaMapsItem workspace items Enabled details panel for Report, ReportTemplate and AquaMapsItem workspace items
## [3.1.0] - 2010-09-03
## [3-1-0] - [2010-09-03] [#36] ICIS / Workspace / Upload an archive
#36: ICIS / Workspace / Upload an archive
Merged ThumbnailServlet and ImageServlet Merged ThumbnailServlet and ImageServlet
#774: Workspace portlet tree - Open Report / Template redirect link not working [#774]: Workspace portlet tree - Open Report / Template redirect link not working
## [3.0.0] - 2010-07-16
## [3-0-0] - [2010-07-16]
Ported to GWT 2.0 Ported to GWT 2.0
@ -518,10 +469,9 @@ Updated project structure to WebPortlet
Update to LifeRay portal Update to LifeRay portal
## [2.6.0] - 2010-05-14
## [2-6-0] - [2010-05-14] [#424]: Workspace code refactoring an enanchement
#424: Workspace code refactoring an enanchement
refactored code refactored code
@ -530,50 +480,41 @@ uniformed icons, no more specialized action icons
added more informations on items like AquaMapsItem, Report and Report Template added more informations on items like AquaMapsItem, Report and Report Template
## [2.5.0] - 2010-01-29
## [2-5-0] - [2010-01-29]
gcube release 1.7.0 gcube release 1.7.0
## [2.4.0] - 2009-11-30
## [2-4-0] - [2009-11-30]
gcube release 1.6.0 gcube release 1.6.0
## [2.3.0] - 2009-11-16
## [2-3-0] - [2009-11-16]
gcube release 1.5.0 gcube release 1.5.0
## [2.2.0] - 2009-10-16
## [2-2-0] - [2009-10-16]
gcube release gcube release
## [2.1.1] - 2009-07-29
## [2-1-1] - [2009-07-29]
gcube release 1.2.2 gcube release 1.2.2
## [2.1.0] - 2009-07-14
## [2-1-0] - [2009-07-14]
gcube release 1.2.0 gcube release 1.2.0
## [2.0.0] - 2009-05-19
## [2-0-0] - [2009-05-19]
gcube release 1.2.0 rc1 gcube release 1.2.0 rc1
## [1.1.2] - 2009-01-12
## [1-1-2] - [2009-01-12]
first release first release

@ -15,7 +15,7 @@
<include>README.md</include> <include>README.md</include>
<include>LICENSE.md</include> <include>LICENSE.md</include>
<include>profile.xml</include> <include>profile.xml</include>
<include>changelog.md</include> <include>CHANGELOG.md</include>
</includes> </includes>
<fileMode>755</fileMode> <fileMode>755</fileMode>
<filtered>true</filtered> <filtered>true</filtered>

@ -11,7 +11,7 @@
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>workspace-tree-widget</artifactId> <artifactId>workspace-tree-widget</artifactId>
<version>6.30.0</version> <version>6.30.1-SNAPSHOT</version>
<name>gCube Workspace Tree Widget</name> <name>gCube Workspace Tree Widget</name>
<description> <description>
gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace

@ -477,7 +477,15 @@ public class StorageHubToWorkpaceConverter implements Serializable{
for (AccountEntry shubAccEntry : accoutings) { for (AccountEntry shubAccEntry : accoutings) {
GxtAccountingField af = new GxtAccountingField(); GxtAccountingField af = new GxtAccountingField();
InfoContactModel user = buildGxtInfoContactFromPortalLogin(shubAccEntry.getUser());
String theUser = shubAccEntry.getUser();
InfoContactModel user = null;
if(theUser!=null && !theUser.equalsIgnoreCase("ALL")){
user = buildGxtInfoContactFromPortalLogin(shubAccEntry.getUser());
}else {
//CASE ALL
user = new InfoContactModel(theUser, theUser, theUser, null, false);
}
af.setUser(user); af.setUser(user);
af.setDate(FormatterUtil.toDate(shubAccEntry.getDate())); af.setDate(FormatterUtil.toDate(shubAccEntry.getDate()));
@ -677,8 +685,13 @@ public class StorageHubToWorkpaceConverter implements Serializable{
af.setOperation(GxtAccountingEntryType.UNSHARE); af.setOperation(GxtAccountingEntryType.UNSHARE);
AccountEntryUnshare uns = (AccountEntryUnshare) shubAccEntry; AccountEntryUnshare uns = (AccountEntryUnshare) shubAccEntry;
String msg = uns.getItemName()==null || uns.getItemName().isEmpty()?"":uns.getItemName()+" "; String msg = "Folder ";
msg+=GxtAccountingEntryType.UNSHARE.getName()+" by "+user.getName(); msg+= uns.getItemName()==null || uns.getItemName().isEmpty()?"":uns.getItemName()+" ";
if(user.getName().equalsIgnoreCase("ALL")) {
msg+= "is no longer shared";
}else
msg+= "is no longer shared with "+user.getName();
af.setDescription(msg); af.setDescription(msg);
} }
break; break;

Loading…
Cancel
Save