Bug #1541: Fix issue reseting selected element when progress is hidden
FEA: ItEr77S04BugFixing
This commit is contained in:
parent
4cc12a3dbf
commit
7ab8e7f07c
2 changed files with 4 additions and 1 deletions
|
|
@ -73,6 +73,7 @@ import org.zkoss.zul.Listbox;
|
|||
import org.zkoss.zul.Listitem;
|
||||
import org.zkoss.zul.SimpleListModel;
|
||||
import org.zkoss.zul.South;
|
||||
import org.zkoss.zul.api.Combobox;
|
||||
|
||||
public class Planner extends HtmlMacroComponent {
|
||||
|
||||
|
|
@ -636,11 +637,13 @@ public class Planner extends HtmlMacroComponent {
|
|||
public void showAdvances() {
|
||||
Button showAdvancesButton = (Button) getFellow("showAdvances");
|
||||
if (disabilityConfiguration.isAdvancesEnabled()) {
|
||||
Combobox progressTypesCombo = (Combobox) getFellow("cbProgressTypes");
|
||||
if (isShowingAdvances) {
|
||||
context.hideAdvances();
|
||||
diagramGraph.removePostGraphChangeListener(showAdvanceOnChange);
|
||||
showAdvancesButton.setSclass("planner-command");
|
||||
showAdvancesButton.setTooltiptext(_("Show progress"));
|
||||
progressTypesCombo.setSelectedIndex(0);
|
||||
} else {
|
||||
context.showAdvances();
|
||||
diagramGraph.addPostGraphChangeListener(showAdvanceOnChange);
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@ public class CompanyPlanningController implements Composer {
|
|||
|
||||
@Override
|
||||
public void render(Comboitem item, Object data) {
|
||||
ProgressType progressType = (ProgressType) data;
|
||||
final ProgressType progressType = (ProgressType) data;
|
||||
item.setValue(progressType);
|
||||
item.setLabel(_(progressType.getValue()));
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue