From b76fffab372d405f6decbb72a75f12553890fcaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Fri, 5 Mar 2010 21:11:42 +0100
Subject: [PATCH]  ItEr49S18AdaptacionServiciosREST: Added the field 'code' to
 criterion type list and edion interfaces.

---
 .../src/main/webapp/resources/criterions/_edition-V2.zul      | 4 ++++
 .../src/main/webapp/resources/criterions/_list-V2.zul         | 2 ++
 2 files changed, 6 insertions(+)

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 4e9f4efd5..64475bfc4 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul
@@ -60,6 +60,10 @@
                             <label value="${i18n:_('Description')}" />
                             <textbox value="@{controller.criterionType.description}" rows="3" width="390px"/>
                         </row>
+                        <row>
+                            <label value="${i18n:_('Code')}" />
+                            <label value="@{controller.criterionType.code}"/>
+                        </row>
                     </rows>
                 </grid>
                 <separator bar="false" spacing="40px" orient="vertical"/>
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul
index 6c7d4ed76..21290c937 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul
@@ -22,12 +22,14 @@
 <newdatasortablegrid model="@{controller.criterionTypes}" fixedLayout="true">
    <columns>
         <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(name)"/>
+        <newdatasortablecolumn label="${i18n:_('Code')}"/>
         <newdatasortablecolumn width="60px" label="${i18n:_('Enabled')}"/>
         <newdatasortablecolumn width="200px" label="${i18n:_('Operations')}"/>
     </columns>
     <rows>
         <row self="@{each='criterionType'}" value="@{criterionType}">
             <label value="@{criterionType.name}"/>
+            <label value="@{criterionType.code}"/>
             <checkbox disabled="true" checked="@{criterionType.enabled}"/>
             <hbox>
                 <button sclass="icono" image="/common/img/ico_editar1.png"