diff --git a/.classpath b/.classpath index a55761e..06357ed 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -31,5 +31,5 @@ - + diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index 8c59cc5..757f76e 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -2,6 +2,6 @@ <<<<<<<=.mine >>>>>>>=.r71295 eclipse.preferences.version=1 -lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.9.2-SNAPSHOT +lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.10.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 e835890..fa1497d 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -7,9 +7,6 @@ uses - - uses - diff --git a/distro/changelog.xml b/distro/changelog.xml index b9592e0..1c49fc6 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,15 +1,21 @@ + + Implemented filter per owner view for VMR-DB Scenario + Added RichText Input fileds for VME-DB Scenario + + + Security enabled for the VME-DB case + Removed workspace tree dependency + Added possibility of Deletion of content of the first entry Close report on commit when in FAO Vulnerable Marine Ecosystem - (VME) Mode - - - Security enabled for the VME-DB case - Removed workspace tree dependency + (VME) Mode + diff --git a/pom.xml b/pom.xml index f048535..2735dea 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.user reports war - 4.9.2-SNAPSHOT + 4.10.0-SNAPSHOT gCube Reports Manager gCube Reports Portlet. diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java index a23fa7b..8b10aef 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java @@ -359,13 +359,13 @@ public class Headerbar extends Composite{ } }); createMenu.addItem(item); - item = new MenuItem("Delete Fishing footprint", true, new Command() { + item = new MenuItem("Delete Bottom fishing areas", true, new Command() { public void execute() { presenter.showVMEDeleteDialog(VMETypeIdentifier.FisheryAreasHistory); } }); createMenu.addItem(item); - item = new MenuItem("Delete Regional History of VMEs", true, new Command() { + item = new MenuItem("Delete Regional overview of VMEs", true, new Command() { public void execute() { presenter.showVMEDeleteDialog(VMETypeIdentifier.VMEsHistory); } @@ -406,14 +406,14 @@ public class Headerbar extends Composite{ }); importMenu.addItem(item); - item = new MenuItem("Edit Fishing footprint", true, new Command() { + item = new MenuItem("Edit Bottom fishing areas", true, new Command() { public void execute() { presenter.showVMEReportRefImportDialog(VMETypeIdentifier.FisheryAreasHistory); } }); importMenu.addItem(item); - item = new MenuItem("Edit Regional History of VMEs", true, new Command() { + item = new MenuItem("Edit Regional overview of VMEs", true, new Command() { public void execute() { presenter.showVMEReportRefImportDialog(VMETypeIdentifier.VMEsHistory); } @@ -465,14 +465,14 @@ public class Headerbar extends Composite{ }); importMenu.addItem(item); - item = new MenuItem("Create new Fishing footprint", true, new Command() { + item = new MenuItem("Create new Bottom fishing areas", true, new Command() { public void execute() { presenter.importVMETemplate(VMETypeIdentifier.FisheryAreasHistory); } }); importMenu.addItem(item); - item = new MenuItem("Create new Regional History of VMEs", true, new Command() { + item = new MenuItem("Create new Regional overview of VMEs", true, new Command() { public void execute() { presenter.importVMETemplate(VMETypeIdentifier.VMEsHistory); }