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

Bug #1541: Fix issue reseting selected element when progress is hidden

Browse source 
FEA: ItEr77S04BugFixing
This commit is contained in:
Jacobo Aragunde Pérez 2012-11-23 12:57:55 +01:00 • committed by Manuel Rego Casasnovas
parent 4cc12a3dbf
commit 7ab8e7f07c
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
View file

@ -73,6 +73,7 @@ import org.zkoss.zul.Listbox;
import org.zkoss.zul.Listitem; import org.zkoss.zul.Listitem;
import org.zkoss.zul.SimpleListModel; import org.zkoss.zul.SimpleListModel;
import org.zkoss.zul.South; import org.zkoss.zul.South;
import org.zkoss.zul.api.Combobox;
public class Planner extends HtmlMacroComponent { public class Planner extends HtmlMacroComponent {
@ -636,11 +637,13 @@ public class Planner extends HtmlMacroComponent {
public void showAdvances() { public void showAdvances() {
Button showAdvancesButton = (Button) getFellow("showAdvances"); Button showAdvancesButton = (Button) getFellow("showAdvances");
if (disabilityConfiguration.isAdvancesEnabled()) { if (disabilityConfiguration.isAdvancesEnabled()) {
Combobox progressTypesCombo = (Combobox) getFellow("cbProgressTypes");
if (isShowingAdvances) { if (isShowingAdvances) {
context.hideAdvances(); context.hideAdvances();
diagramGraph.removePostGraphChangeListener(showAdvanceOnChange); diagramGraph.removePostGraphChangeListener(showAdvanceOnChange);
showAdvancesButton.setSclass("planner-command"); showAdvancesButton.setSclass("planner-command");
showAdvancesButton.setTooltiptext(_("Show progress")); showAdvancesButton.setTooltiptext(_("Show progress"));
progressTypesCombo.setSelectedIndex(0);
} else { } else {
context.showAdvances(); context.showAdvances();
diagramGraph.addPostGraphChangeListener(showAdvanceOnChange); diagramGraph.addPostGraphChangeListener(showAdvanceOnChange);

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
View file

@ -197,7 +197,7 @@ public class CompanyPlanningController implements Composer {
@Override @Override
public void render(Comboitem item, Object data) { public void render(Comboitem item, Object data) {
ProgressType progressType = (ProgressType) data; final ProgressType progressType = (ProgressType) data;
item.setValue(progressType); item.setValue(progressType);
item.setLabel(_(progressType.getValue())); item.setLabel(_(progressType.getValue()));