bug fixed #21575
This commit is contained in:
parent
a919610ea9
commit
aec4b7a5b7
|
@ -5,6 +5,12 @@ 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.33.1-SNAPSHOT] - 2021-06-11
|
||||||
|
|
||||||
|
#### Fixes
|
||||||
|
|
||||||
|
[#21575] Fixed icon associated with simple folders in the grid view
|
||||||
|
|
||||||
## [v6.33.0] - 2021-05-11
|
## [v6.33.0] - 2021-05-11
|
||||||
|
|
||||||
#### Enhancements
|
#### Enhancements
|
||||||
|
|
4
pom.xml
4
pom.xml
|
@ -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.33.0</version>
|
<version>6.33.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
|
||||||
|
@ -46,7 +46,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.distribution</groupId>
|
<groupId>org.gcube.distribution</groupId>
|
||||||
<artifactId>maven-portal-bom</artifactId>
|
<artifactId>maven-portal-bom</artifactId>
|
||||||
<version>3.6.2</version>
|
<version>3.6.2-SNAPSHOT</version>
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
|
@ -330,21 +330,21 @@ public class FileModel extends BaseModelData implements Serializable, IsSerializ
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// SPECIAL FOLDER?
|
// SPECIAL FOLDER?
|
||||||
if (this.isSpecialFolder())
|
if (this.isSpecialFolder()) {
|
||||||
absImgPr = Resources.getIconSpecialFolder();
|
absImgPr = Resources.getIconSpecialFolder();
|
||||||
else { // SIMPLE FOLDER
|
} else { // SIMPLE FOLDER
|
||||||
if (this.isPublic()) // IS PLUBIC
|
if (this.isPublic()) { // IS PLUBIC
|
||||||
absImgPr = Resources.getIconFolderPublic();
|
absImgPr = Resources.getIconFolderPublic();
|
||||||
else {
|
} else {
|
||||||
if (this.getSynchedWithWsThredds() != null) {
|
Boolean isSynched = this.getSynchedWithWsThredds();
|
||||||
if(this.getSynchedWithWsThredds()) {
|
if (isSynched != null && isSynched) {
|
||||||
absImgPr = Resources.getIconSynchedFolder();
|
absImgPr = Resources.getIconSynchedFolder();
|
||||||
}
|
} else {
|
||||||
} else
|
|
||||||
absImgPr = Resources.getIconFolder();
|
absImgPr = Resources.getIconFolder();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return absImgPr;
|
return absImgPr;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue