RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Bug #879] Using inherited instead of indirect for criteria and labels.

Browse source 
FEA: ItEr71S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2011-02-21 18:50:42 +01:00
parent a76e26a4e5
commit b6590e691a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java
View file

@ -45,7 +45,7 @@ public class CriterionRequirementWrapper implements INewObject {
public final String DIRECT = _("Direct");
public static String getIndirectTypeLabel() {
return _("Indirect");
return _("Inherited");
}
private String type;

4
navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
View file

@ -24,9 +24,9 @@
]]>
</zscript>
<vbox apply="${assignedLabelsController}" width="100%">
<!-- Indirect labels -->
<!-- Inherited labels -->
<vbox width="100%">
<panel title="${i18n:_('Indirect labels')}" border="normal">
<panel title="${i18n:_('Inherited labels')}" border="normal">
<panelchildren>
<grid id="inheritedLabels" height="150px" fixedLayout="true"
model="@{assignedLabelsController.inheritedLabels}">