Revert "[Bug #911] Disabling at interface criterion hierarchy while bug is not fixed."
This reverts commit 295912b3c7. Besides
the CriterionType of a Criterion is eagerly loaded. Otherwise when
having child criterions, proxy errors accesing CriterionType were
happening.
This commit is contained in:
parent
84e3bf082b
commit
5f6d4da513
3 changed files with 3 additions and 4 deletions
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 -->
|
||||
|
|
|
|||
|
|
@ -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')}" />
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue