From b0b6f064daff510ccf37d7b5a00e861e2d4c3131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Thu, 3 Dec 2009 14:43:59 +0100
Subject: [PATCH] ItEr37S06ValidacionEProbasFuncionaisItEr36S07: [Bug #114].
 Fixing bug.

Deleting wrong author declaration too.
---
 .../web/resources/criterion/CriterionAdminController_V2.java    | 1 -
 .../src/main/webapp/resources/criterions/_edition-V2.zul        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java
index 2fab9b77d..43b15e526 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java
@@ -44,7 +44,6 @@ import org.zkoss.zul.Window;
 
 /**
  * Controller for Criterions <br />
- * @author Óscar González Fernández <ogonzalez@igalia.com>
  */
 public class CriterionAdminController_V2 extends GenericForwardComposer {
 
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul
index bfbc233ea..319ead38c 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul
@@ -39,7 +39,7 @@
                         <row>
                             <label value="${i18n:_('Type')}" />
                             <zscript>Object[] resourceTypes = org.navalplanner.business.resources.entities.ResourceEnum.values();</zscript>
-                            <listbox id="lbResource" mold="select" model="@{resourceTypes}" selectedItem="@{controller.datePosition}"/>
+                            <listbox id="lbResource" mold="select" model="@{resourceTypes}" selectedItem="@{controller.criterionType.resource}"/>
                         </row>
                         <row>
                             <label value="${i18n:_('Multiple values per resource')}"/>