From a8e8a9be02fc76b48bf984acf208575015056916 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smpedreira@gmail.com>
Date: Wed, 9 Dec 2009 20:19:45 +0100
Subject: [PATCH]  ItEr38S05ValidacionEProbasFuncionaisItEr37S06 : fix the
 remove operation to a work report type.

---
 .../web/workreports/IWorkReportTypeModel.java         |  8 ++++++--
 .../web/workreports/WorkReportTypeCRUDController.java |  7 +------
 .../web/workreports/WorkReportTypeModel.java          | 11 ++++++++++-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportTypeModel.java
index d649262ea..af3bed505 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportTypeModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportTypeModel.java
@@ -94,14 +94,18 @@ public interface IWorkReportTypeModel {
 
     /**
      * Check if it's or not editing a {@link WorkReportType}
-     *
      * @return true if it's editing a {@link WorkReportType}
      */
     boolean isEditing();
 
+    /**
+     * Set if it's or not shows {@link WorkReportType} list
+     * @return true if it's shows the list.
+     */
+    void setListing(boolean listing);
+
     /**
      * Check if there is any {@link WorkReport} bound to {@link WorkReportType}
-     *
      * @param workReportType
      * @return
      */
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java
index 8aba7f101..1a5dc5983 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java
@@ -157,6 +157,7 @@ public class WorkReportTypeCRUDController extends GenericForwardComposer
     }
 
     public void goToList() {
+        this.workReportTypeModel.setListing(true);
         Util.reloadBindings(listWindow);
         getVisibility().showOnly(listWindow);
     }
@@ -217,12 +218,6 @@ public class WorkReportTypeCRUDController extends GenericForwardComposer
     public boolean isEditable() {
         return (!thereAreWorkReportsFor(getWorkReportType()));
     }
-    public void remove(WorkReportType workReportType) {
-        workReportTypeModel.confirmRemove(workReportType);
-        Util.reloadBindings(listWindow);
-        messagesForUser.showMessage(
-            Level.INFO, _("Removed {0}", workReportType.getName()));
-    }
 
     public void goToEditForm() {
         getVisibility().showOnly(editWindow);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java
index 54ee5dbbb..497230d96 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java
@@ -75,6 +75,8 @@ public class WorkReportTypeModel implements IWorkReportTypeModel {
 
     private boolean editing = false;
 
+    private boolean listing = true;
+
     private static final Map<LabelType, List<Label>> mapLabels = new HashMap<LabelType, List<Label>>();
 
     @Override
@@ -97,7 +99,7 @@ public class WorkReportTypeModel implements IWorkReportTypeModel {
     @Override
     @Transactional(readOnly = true)
     public boolean thereAreWorkReportsFor(WorkReportType workReportType) {
-        if (isEditing()) {
+        if ((listing) || (isEditing())) {
             final List<WorkReport> workReports = workReportDAO
                     .getAllByWorkReportType(workReportType);
             return (workReports != null && !workReports.isEmpty());
@@ -115,6 +117,7 @@ public class WorkReportTypeModel implements IWorkReportTypeModel {
     @Transactional(readOnly = true)
     public void prepareForCreate() {
         loadLabels();
+        setListing(false);
         editing = false;
         this.workReportType = WorkReportType.create();
     }
@@ -122,6 +125,7 @@ public class WorkReportTypeModel implements IWorkReportTypeModel {
     @Override
     @Transactional(readOnly = true)
     public void initEdit(WorkReportType workReportType) {
+        setListing(false);
         editing = true;
         Validate.notNull(workReportType);
         loadLabels();
@@ -197,6 +201,11 @@ public class WorkReportTypeModel implements IWorkReportTypeModel {
         return this.editing;
     }
 
+    @Override
+    public void setListing(boolean listing) {
+        this.listing = listing;
+    }
+
     /* Operations to manage the Description field */
 
     public List<DescriptionField> getDescriptionFields() {