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

ItEr44S15RFNavegacionOrganizacionTraballoItEr43S20: Removed down, up, indent, unindent and delete buttons from OrderElements list top

Browse source
This commit is contained in:
Lorenzo Tilve 2010-01-21 14:47:53 +01:00 • committed by Javier Moran Rua
parent c51bf06691
commit 0124af5aff
2 changed files with 3 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java
View file

@ -240,7 +240,7 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
return !isItemSelected();
}
protected Button btnNew, btnDown, btnUp, btnUnindent, btnIndent, btnDelete;
protected Button btnNew;
private List<Column> columns;
@ -250,13 +250,7 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
}
private void resetControlButtons() {
final boolean disabled = tree.getSelectedItem() == null;
btnNew.setDisabled(isNewButtonDisabled());
btnIndent.setDisabled(disabled);
btnUnindent.setDisabled(disabled);
btnUp.setDisabled(disabled);
btnDown.setDisabled(disabled);
btnDelete.setDisabled(disabled);
}
protected abstract boolean isNewButtonDisabled();
@ -559,17 +553,7 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
resetControlButtons();
return;
}
boolean disabledLevel1 = isNewButtonDisabled()
&& isFirstLevelElement(item);
boolean disabledLevel2 = isNewButtonDisabled()
&& (isFirstLevelElement(item) || isSecondLevelElement(item));
btnNew.setDisabled(false);
btnDown.setDisabled(disabledLevel1);
btnUp.setDisabled(disabledLevel1);
btnUnindent.setDisabled(disabledLevel2);
btnIndent.setDisabled(disabledLevel1);
btnDelete.setDisabled(false);
}
protected abstract boolean isPredicateApplied();

15
navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul
View file

@ -25,25 +25,14 @@
<vbox>
<vbox>
<hbox>
<hbox >
<button id="btnNew" label="${treeComponent.addElementLabel}"
onClick="treeController.addElement();" />
<button label="${i18n:_('Create Template')}"
onClick="treeController.createTemplate();"
visible="${treeComponent.createTemplateEnabled}"/>
<button id="btnDown" label="${i18n:_('Down')}"
onClick="treeController.down();" />
<button id="btnUp" label="${i18n:_('Up')}"
onClick="treeController.up();" />
<button id="btnUnindent" label="${i18n:_('Unindent')}"
onClick="treeController.unindent();" />
<button id="btnIndent" label="${i18n:_('Indent')}"
onClick="treeController.indent();" />
<button id="btnDelete" label="${treeComponent.removeElementLabel}"
onClick="treeController.removeElement();" />
</hbox>
</vbox>
<vbox id="filter">
<vbox id="filter" />
</vbox>
<vbox>
<tree id="tree" width="1050" multiple="true" droppable="true"