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

Fixing [Bug #18577]

This commit is contained in:
Francesco Mangiacrapa 2020-02-14 11:53:15 +01:00
parent 4813990d69
commit fb223e6c49
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.xml
View File

@ -6,6 +6,7 @@
</Change> </Change>
<Change>[Feature #18150] Get Shareable Link coy to clipboard facility <Change>[Feature #18150] Get Shareable Link coy to clipboard facility
</Change> </Change>
<Change>[Bug #18577] Fixing Shareable link informative text for public file</Change>
</Changeset> </Changeset>
<Changeset <Changeset
component="org.gcube.portlets-user.workspace-portlet-tree.6-28-1" component="org.gcube.portlets-user.workspace-portlet-tree.6-28-1"

12
src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.java
View File

@ -85,6 +85,9 @@ public class DialogShareableLink extends Composite {
@UiField @UiField
Well alertFilePublicLink; Well alertFilePublicLink;
@UiField
Well alertVersionedFilePublicLink;
@UiField @UiField
Well alertFolderPublicLink; Well alertFolderPublicLink;
@ -430,6 +433,7 @@ public class DialogShareableLink extends Composite {
fieldPrivateSharing.setVisible(false); fieldPrivateSharing.setVisible(false);
cgPublicLink.setVisible(false); cgPublicLink.setVisible(false);
alertFilePublicLink.setVisible(false); alertFilePublicLink.setVisible(false);
alertVersionedFilePublicLink.setVisible(false);
alertFolderPublicLink.setVisible(false); alertFolderPublicLink.setVisible(false);
filedEnableDisableSharing.setVisible(false); filedEnableDisableSharing.setVisible(false);
buttonShareSettings.setVisible(false); buttonShareSettings.setVisible(false);
@ -489,7 +493,13 @@ public class DialogShareableLink extends Composite {
//panelFieldsContainer.setVisible(true); //panelFieldsContainer.setVisible(true);
cgPublicLink.setVisible(true); cgPublicLink.setVisible(true);
filedEnableDisableSharing.setVisible(true); filedEnableDisableSharing.setVisible(true);
alertFilePublicLink.setVisible(true);
if(version!=null && !version.isEmpty()) {
alertVersionedFilePublicLink.setVisible(true); //Message for versioned File
}else {
alertFilePublicLink.setVisible(true); //Message for latest version of File
}
if(!item.isPublic()) { //THE FILE IS PRIVATE if(!item.isPublic()) { //THE FILE IS PRIVATE
switchButton.setVisible(false); switchButton.setVisible(false);
if(version!=null && !version.isEmpty()) { if(version!=null && !version.isEmpty()) {

16
src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.ui.xml
View File

@ -148,13 +148,19 @@
view view
the the
content. No login required</b:Well> content. No login required</b:Well>
<b:Well ui:field="alertFilePublicLink" visible="false">By sharing <b:Well ui:field="alertFilePublicLink" visible="false">Anyone with
this link can download it, no login is required. This link will
always point to the latest version of the file</b:Well>
<b:Well ui:field="alertVersionedFilePublicLink"
visible="false">By sharing
the following the following
Public Link, anyone with link can download it. Public Link, anyone with link can
download it.
The The
link will always point to the link will always point to the
version version
of the file at the of the file at
the
time of link time of link
creation. No login required</b:Well> creation. No login required</b:Well>
<b:ControlLabel>Public Link</b:ControlLabel> <b:ControlLabel>Public Link</b:ControlLabel>
@ -164,8 +170,8 @@
<b:TextBox ui:field="textPublicLink" readOnly="true"> <b:TextBox ui:field="textPublicLink" readOnly="true">
</b:TextBox> </b:TextBox>
<b:Tooltip text='Copied to clipboard' trigger="MANUAL"> <b:Tooltip text='Copied to clipboard' trigger="MANUAL">
<b:Button icon="COPY" <b:Button icon="COPY" ui:field="publicLinkCopyButton"
ui:field="publicLinkCopyButton" type="PRIMARY"></b:Button> type="PRIMARY"></b:Button>
</b:Tooltip> </b:Tooltip>
</b:InputAddOn> </b:InputAddOn>
<b:Button ui:field="showPublicLongLinkButton" type="LINK" <b:Button ui:field="showPublicLongLinkButton" type="LINK"