diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java index 075daad16..8f020425e 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java @@ -49,6 +49,16 @@ import org.zkoss.zul.api.Button; public class Planner extends HtmlMacroComponent { + public static void registerNeededScripts() { + IScriptsRegister register = getScriptsRegister(); + register.register(ScriptsRequiredByPlanner.class); + } + + private static IScriptsRegister getScriptsRegister() { + return OnZKDesktopRegistry.getLocatorFor(IScriptsRegister.class) + .retrieve(); + } + private GanttDiagramGraph diagramGraph; private LeftPane leftPane; @@ -73,11 +83,6 @@ public class Planner extends HtmlMacroComponent { registerNeededScripts(); } - private void registerNeededScripts() { - IScriptsRegister register = getScriptsRegister(); - register.register(ScriptsRequiredByPlanner.class); - } - TaskList getTaskList() { if (ganttPanel == null) { return null; @@ -281,11 +286,6 @@ public class Planner extends HtmlMacroComponent { getDependencyList().redrawDependencies(); } - private IScriptsRegister getScriptsRegister() { - return OnZKDesktopRegistry.getLocatorFor(IScriptsRegister.class) - .retrieve(); - } - @Override public void afterCompose() { super.afterCompose(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java index cf059a4fa..4904e18c5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java @@ -42,6 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; +import org.zkoss.ganttz.Planner; import org.zkoss.ganttz.TabSwitcher; import org.zkoss.ganttz.TabsRegistry; import org.zkoss.ganttz.adapters.State; @@ -201,6 +202,7 @@ public class MultipleTabsPlannerController implements Composer, @Override public void doAfterCompose(org.zkoss.zk.ui.Component comp) throws Exception { + Planner.registerNeededScripts(); tabsSwitcher = (TabSwitcher) comp; breadcrumbs = comp.getPage().getFellow("breadcrumbs"); tabsSwitcher.setConfiguration(buildTabsConfiguration());