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

ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #569] Fix bug.

Browse source 
Not translating the zoom parameter when used as parameter.
This commit is contained in:
Óscar González Fernández 2010-08-03 17:45:01 +02:00
parent f2e878d27a
commit 7b36ddd9cc
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
View file

@ -39,13 +39,13 @@ import org.zkoss.ganttz.adapters.PlannerConfiguration;
import org.zkoss.ganttz.data.Dependency; import org.zkoss.ganttz.data.Dependency;
import org.zkoss.ganttz.data.DependencyType; import org.zkoss.ganttz.data.DependencyType;
import org.zkoss.ganttz.data.GanttDiagramGraph; import org.zkoss.ganttz.data.GanttDiagramGraph;
import org.zkoss.ganttz.data.GanttDiagramGraph.GanttZKDiagramGraph;
import org.zkoss.ganttz.data.ITaskFundamentalProperties; import org.zkoss.ganttz.data.ITaskFundamentalProperties;
import org.zkoss.ganttz.data.Milestone; import org.zkoss.ganttz.data.Milestone;
import org.zkoss.ganttz.data.Position; import org.zkoss.ganttz.data.Position;
import org.zkoss.ganttz.data.Task; import org.zkoss.ganttz.data.Task;
import org.zkoss.ganttz.data.TaskContainer; import org.zkoss.ganttz.data.TaskContainer;
import org.zkoss.ganttz.data.TaskLeaf; import org.zkoss.ganttz.data.TaskLeaf;
import org.zkoss.ganttz.data.GanttDiagramGraph.GanttZKDiagramGraph;
import org.zkoss.ganttz.data.criticalpath.CriticalPathCalculator; import org.zkoss.ganttz.data.criticalpath.CriticalPathCalculator;
import org.zkoss.ganttz.extensions.IContext; import org.zkoss.ganttz.extensions.IContext;
import org.zkoss.ganttz.timetracker.TimeTracker; import org.zkoss.ganttz.timetracker.TimeTracker;
@ -426,7 +426,7 @@ public class FunctionalityExposedForExtensions<T> implements IContext<T> {
if (resources.isChecked() == true) { if (resources.isChecked() == true) {
parameters.put("resources", "all"); parameters.put("resources", "all");
} }
parameters.put("zoom", planner.getZoomLevel().toString()); parameters.put("zoom", planner.getZoomLevel().getInternalName());
return parameters; return parameters;
} }

12
ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java
View file

@ -114,10 +114,14 @@ public enum ZoomLevel {
return string; return string;
} }
private String name; private String internalName;
public String getInternalName() {
return internalName;
}
private ZoomLevel(String name) { private ZoomLevel(String name) {
this.name = name; this.internalName = name;
} }
/** /**
@ -149,14 +153,14 @@ public enum ZoomLevel {
@Override @Override
public String toString() { public String toString() {
return I18nHelper._(name); return I18nHelper._(internalName);
} }
public static ZoomLevel getFromString(String zoomLevelParameter) { public static ZoomLevel getFromString(String zoomLevelParameter) {
ZoomLevel requiredZoomLevel = ZoomLevel.DETAIL_ONE; ZoomLevel requiredZoomLevel = ZoomLevel.DETAIL_ONE;
if (zoomLevelParameter != null) { if (zoomLevelParameter != null) {
for (ZoomLevel z : ZoomLevel.values()) { for (ZoomLevel z : ZoomLevel.values()) {
if (zoomLevelParameter.equals(z.name)) { if (zoomLevelParameter.equals(z.internalName)) {
requiredZoomLevel = z; requiredZoomLevel = z;
} }
} }