From 086c1891ddb4a8ea6cf8a5b39ffa033fdf086939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 10 May 2011 12:11:39 +0200 Subject: [PATCH] Fix regression introduced in c05150b2345a4c2bebd631c690daf69aeda0f06e Most pages only handled entry points through a bookmark change. Now they handle requests with matrix parameters too. FEA: ItEr74S04BugFixing --- ganttzk/src/main/java/org/zkoss/ganttz/Planner.java | 2 ++ .../navalplanner/web/common/entrypoints/URLHandler.java | 7 ++++++- .../web/planner/tabs/MultipleTabsPlannerController.java | 2 +- .../web/resources/worker/WorkerCRUDController.java | 2 +- .../web/templates/OrderTemplatesController.java | 2 +- .../org/navalplanner/web/users/UserCRUDController.java | 2 +- .../web/workreports/WorkReportCRUDController.java | 2 +- .../web/workreports/WorkReportTypeCRUDController.java | 2 +- 8 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java index 865987c53..a4297b505 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java @@ -373,6 +373,8 @@ public class Planner extends HtmlMacroComponent { this.visibleChart = configuration.isExpandPlanningViewCharts(); ((South) getFellow("graphics")).setOpen(this.visibleChart); + + newContext.getDiagramGraph().enforceAllRestrictions(); } private void resettingPreviousComponentsToNull() { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java index 1d3de1a8a..477780aad 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java @@ -303,7 +303,12 @@ public class URLHandler { return false; } - public void registerListener(final S controller, Page page) { + public void register(final S controller, Page page) { + registerBookmarkListener(controller, page); + applyIfMatches(controller); + } + + public void registerBookmarkListener(final S controller, Page page) { page.addEventListener("onBookmarkChange", new EventListener() { @Override 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 6bc1b37a7..25a8b5f04 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 @@ -379,7 +379,7 @@ public class MultipleTabsPlannerController implements Composer, goToCompanyScheduling(); planningTab.toggleToFeedback(); } - handler.registerListener(this, comp.getPage()); + handler.registerBookmarkListener(this, comp.getPage()); } private TabsRegistry getTabsRegistry() { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java index 90372a83a..fd6299040 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java @@ -338,7 +338,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements final URLHandler handler = URLHandlerRegistry .getRedirectorFor(IWorkerCRUDControllerEntryPoints.class); - handler.registerListener(this, page); + handler.register(this, page); getVisibility().showOnly(listWindow); initFilterComponent(); setupFilterLimitingResourceListbox(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java index ebad24d08..4b7c28f13 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java @@ -267,7 +267,7 @@ public class OrderTemplatesController extends GenericForwardComposer implements final URLHandler handler = handlerRegistry .getRedirectorFor(IOrderTemplatesControllerEntryPoints.class); - handler.registerListener(this, page); + handler.register(this, page); setBreadcrumbs(comp); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java index 42679a872..cb1369e0d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java @@ -86,7 +86,7 @@ public class UserCRUDController extends GenericForwardComposer implements final URLHandler handler = URLHandlerRegistry .getRedirectorFor(IUserCRUDController.class); - handler.registerListener(this, page); + handler.register(this, page); getVisibility().showOnly(listWindow); passwordBox = (Textbox) createWindow.getFellowIfAny("password"); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java index e012a7a43..a7ffea972 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java @@ -173,7 +173,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements comp.setVariable("controller", this, true); final URLHandler handler = URLHandlerRegistry .getRedirectorFor(IWorkReportCRUDControllerEntryPoints.class); - handler.registerListener(this, page); + handler.register(this, page); initCurrentList(); if(listType != null) { //listType is null in reports -> work report lines diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java index 2e1683cfa..281cabbc5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java @@ -141,7 +141,7 @@ public class WorkReportTypeCRUDController extends GenericForwardComposer comp.setVariable("controller", this, true); final URLHandler handler = URLHandlerRegistry .getRedirectorFor(IWorkReportTypeCRUDControllerEntryPoints.class); - handler.registerListener(this, page); + handler.register(this, page); getVisibility().showOnly(listWindow); }