This is an automated email from the git hooks/post-receive script. New commit to branch feature/7588_maree_ocean_modifiable_avec_sous_item in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 5a6c6c766f57a20993fddb4ce14c85fbb88dadd9 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Fri Aug 5 18:03:54 2016 +0200 Restaure le control d'activation sur l'ocean d'une marée refs #7588 --- .../fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx | 3 ++- .../fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jcss | 2 +- .../java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx | 3 ++- .../java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jcss | 3 +-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx index 1735665..2dd9b68 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx @@ -29,6 +29,7 @@ fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.TripLonglineDto fr.ird.observe.services.dto.longline.ActivityLonglineDto + fr.ird.observe.services.dto.longline.TripLonglineActivityDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.HarbourDto fr.ird.observe.services.dto.referential.PersonDtos @@ -74,7 +75,7 @@ <script><![CDATA[ -protected boolean canEditOcean(java.util.List<ActivityLonglineDto> activities) { +protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityDto> activities) { return activities == null || activities.isEmpty(); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jcss index 8490def..3e4ff73 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jcss @@ -98,7 +98,7 @@ NumberEditor { #ocean { property:{TripLonglineDto.PROPERTY_OCEAN}; selectedItem:{bean.getOcean()}; - //enabled:{canEditOcean(bean.getActivityLongline())}; + enabled:{canEditOcean(bean.getActivityLongline())}; } #departureHarbourLabel { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx index 07ac37c..6c1ee6b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx @@ -26,6 +26,7 @@ <import> fr.ird.observe.services.dto.seine.TripSeineDto fr.ird.observe.services.dto.seine.RouteDto + fr.ird.observe.services.dto.seine.RouteStubDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.HarbourDto fr.ird.observe.services.dto.referential.PersonDtos @@ -70,7 +71,7 @@ <script><![CDATA[ -protected boolean canEditOcean(java.util.List<RouteDto> routes) { +protected boolean canEditOcean(java.util.LinkedHashSet<RouteStubDto> routes) { return routes == null || routes.isEmpty(); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jcss index 960ce0d..2ba740d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jcss @@ -92,8 +92,7 @@ NumberEditor { #ocean { property:{TripSeineDto.PROPERTY_OCEAN}; selectedItem:{bean.getOcean()}; - //FIXME - //enabled:{canEditOcean(bean.getRoute())}; + enabled:{canEditOcean(bean.getRoute())}; } #departureHarbourLabel { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.