Chorem-commits

Download

chorem-commits@list.chorem.org

June 2013

5 participants
22 discussions

r339 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions java/org/chorem/webmotion/injector resources webapp/WEB-INF/jsp
by meynier＠users.chorem.org June 13, 2013

June 13, 2013

Author: meynier Date: 2013-06-13 17:30:27 +0200 (Thu, 13 Jun 2013) New Revision: 339 Url: http://chorem.org/projects/chorem/repository/revisions/339 Log: added project dashboard Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java trunk/chorem-webmotion/src/main/resources/mapping trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2013-06-10 13:29:52 UTC (rev 338) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2013-06-13 15:30:27 UTC (rev 339) @@ -453,7 +453,7 @@ //////////////////////////////////////////////////////////////////////////// // - // P R O J E C T + // P R O J E C T // //////////////////////////////////////////////////////////////////////////// Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2013-06-10 13:29:52 UTC (rev 338) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2013-06-13 15:30:27 UTC (rev 339) @@ -50,7 +50,7 @@ // Declare injector context.addInjector(new Injector() { @Override - public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { + public Object getValue(Mapping mapping, Call call,String s, Class<?> type, Type generic) { if (ChoremClient.class.isAssignableFrom(type)) { // Get Client ChoremClient client = ChoremWebMotionUtil.getClient(call); Modified: trunk/chorem-webmotion/src/main/resources/mapping =================================================================== --- trunk/chorem-webmotion/src/main/resources/mapping 2013-06-10 13:29:52 UTC (rev 338) +++ trunk/chorem-webmotion/src/main/resources/mapping 2013-06-13 15:30:27 UTC (rev 339) @@ -66,5 +66,6 @@ * /sales/funnel action:sales.FunnelAction.funnel * /sales/funnel/json/{method} action:sales.SalesAction.{method} * /sales/funnel/json/{method}/{id} action:sales.SalesAction.{method} +* /project action:project.DashboardProjectAction.requestProject * /crm/account/{id} action:crm.AccountAction.view * /crm/quotation/edit/{id} action:crm.QuotationAction.edit Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-06-10 13:29:52 UTC (rev 338) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-06-13 15:30:27 UTC (rev 339) @@ -101,6 +101,7 @@ <li>Current project</li> <li><a href="<c:url value="/wikitty/Project/search"/>"> All projects</a></li> <li><a href="<c:url value="/wikitty/Project/edit/new"/>"> Add project</a></li> + <li><a href="<c:url value="/project"/>"> Dashboard project</a></li> <li class="divider"></li> <li>Propale</li> <li><a href="<c:url value="/wikitty/Quotation/search"/>"> All quotations</a></li>

1 0

r338 - trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector
by tchemit＠users.chorem.org June 10, 2013

June 10, 2013

Author: tchemit Date: 2013-06-10 15:29:52 +0200 (Mon, 10 Jun 2013) New Revision: 338 Url: http://chorem.org/projects/chorem/repository/revisions/338 Log: use new webmotion api Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2013-05-26 18:40:40 UTC (rev 337) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2013-06-10 13:29:52 UTC (rev 338) @@ -50,7 +50,7 @@ // Declare injector context.addInjector(new Injector() { @Override - public Object getValue(Mapping mapping, Call call, Class<?> type, Type generic) { + public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { if (ChoremClient.class.isAssignableFrom(type)) { // Get Client ChoremClient client = ChoremWebMotionUtil.getClient(call);

1 0