From 5f6d4da513aa8e89d69b70456e49856e4b9d6cec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Tue, 12 Apr 2011 16:52:10 +0200
Subject: [PATCH] Revert "[Bug #911] Disabling at interface criterion hierarchy
 while bug is not fixed."

This reverts commit 295912b3c7332c481f0d3f159c5801693742bd1c. Besides
the CriterionType of a Criterion is eagerly loaded. Otherwise when
having child criterions, proxy errors accesing CriterionType were
happening.
---
 .../business/resources/entities/CriterionType.java             | 2 +-
 .../navalplanner/business/resources/entities/Resources.hbm.xml | 2 +-
 .../src/main/webapp/resources/criterions/_edition.zul          | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java
index 45cc1bd39..a023e123d 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java
@@ -146,7 +146,7 @@ public class CriterionType extends IntegrationEntity implements
 
     private String description;
 
-    private Boolean allowHierarchy = false;
+    private Boolean allowHierarchy = true;
 
     private Boolean allowSimultaneousCriterionsPerResource = true;
 
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml
index b7f2a131f..6c4fa2863 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml
@@ -113,7 +113,7 @@
     <property access="field" name="predefinedCriterionInternalName" not-null="false"
         column="predefined_criterion_internal_name" />
     <property access="field" name="active"/>
-    <many-to-one access="field" name="type" column="id_criterion_type" not-null="true" />
+    <many-to-one access="field" name="type" lazy="false" column="id_criterion_type" not-null="true" />
 
     <!--  Indexed. It is probable to navigate from a criterion
     to its children criteria -->
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul
index 2fec54934..03ab77bb4 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul
@@ -53,8 +53,7 @@
                             <label value="${i18n:_('Hierarchy')}" />
                             <checkbox id="cbHierarchy"
                                     checked="@{controller.criterionType.allowHierarchy}"
-                                    onCheck="controller.confirmDisabledHierarchy()"
-                                    disabled="true" />
+                                    onCheck="controller.confirmDisabledHierarchy()" />
                         </row>
                         <row>
                             <label value="${i18n:_('Enabled')}" />