diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs index 1d3611e..c00ed49 100644 --- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs +++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -lastWarOutDir=/home/francesco-mangiacrapa/git/workspace/target/workspace-6.27.0-SNAPSHOT +lastWarOutDir=/home/francescomangiacrapa/git/workspace/target/workspace-6.27.0-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index df9b365..b37ea2f 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,19 +1,85 @@ - + + + + + + + - + + + + + + + - + + + + + + + - + + + + + + + + + + + + + + + + + + + - + + uses + + + uses + + + + + + + + - + + + + + + + - - + + + + + + + + + + + + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index e0574de..c62dee5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v6.27.0-SNAPSHOT] - 2021-05-10 [#21387] Harmonized version of jackson libs to 2.8.11 to resolve conflict +[#21346] Applying new workflow to manage the "Sync with Tredds" facility ## [v6.26.0] - 2021-04-12 diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java index bace1a0..9568aed 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java @@ -1415,6 +1415,7 @@ public class AppController implements SubscriberInterface { //CREATING FOLDER PARENT FOR RPC final FileModel parent = new FolderModel(folder.getIdentifier(), folder.getName(), folder.getParentFileModel(), true, folder.isShared(), folder.isVreFolder(), folder.isPublic()); + parent.setSynchedWithWsThredds(folder.getSynchedWithWsThredds()); wsPortlet.getGridGroupContainer().mask(ConstantsExplorer.LOADING,ConstantsExplorer.LOADINGSTYLE); appContrExplorer.getRpcWorkspaceService().getFolderChildrenForFileGrid(parent, new AsyncCallback>() { @@ -1440,7 +1441,7 @@ public class AppController implements SubscriberInterface { wsPortlet.getGridGroupContainer().unmask(); wsPortlet.getGridGroupContainer().updateStore(result); - AppControllerExplorer.getEventBus().fireEvent(new CheckItemLockedBySyncEvent(folder)); + //AppControllerExplorer.getEventBus().fireEvent(new CheckItemLockedBySyncEvent(folder)); } }); } diff --git a/src/test/resources/.gitignore b/src/test/resources/.gitignore index 3197e17..1905434 100644 --- a/src/test/resources/.gitignore +++ b/src/test/resources/.gitignore @@ -4,3 +4,4 @@ /log4j.properties /pred4s.gcubekey /preprod.gcubekey +/devVRE.gcubekey