- Chorem-commits - mailman.cloud.codelutin.com

r216 - trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag
by bpoussin＠users.chorem.org Aug. 2, 2012

Aug. 2, 2012

Author: bpoussin Date: 2012-08-02 16:20:50 +0200 (Thu, 02 Aug 2012) New Revision: 216 Url: http://chorem.org/repositories/revision/chorem/216 Log: Anomalie #728: Quotation status is not put in edit mode Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-08-02 11:54:50 UTC (rev 215) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-08-02 14:20:50 UTC (rev 216) @@ -231,14 +231,18 @@ throws JspException, IOException { String id = wikitty.getId() + "-" + extName + "-" + fieldName; String value = wikitty.getFieldAsString(extName, fieldName); - /*{<select id="text-<%=id%>" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%> }*/ + /*{<select id="text-<%=id%>" name="<%=name%>" <%=getDynamicAttribute()%> }*/ if (field.isCollection()) { /*{ multiple="multiple" }*/ } /*{ >}*/ List<String> allowedValues = field.getAllowedAsList(); for (String allowedValue : allowedValues) { - /*{<option value="<%=allowedValue%>"<%=getDynamicAttribute()%> ><%=allowedValue%></option>}*/ + String selected = ""; + if (allowedValue.equals(value)) { + selected = "selected"; + } + /*{<option value="<%=allowedValue%>" <%=selected%>><%=allowedValue%></option>}*/ } /*{</select>}*/ }

1 0

r215 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by jcouteau＠users.chorem.org Aug. 2, 2012

Aug. 2, 2012

Author: jcouteau Date: 2012-08-02 13:54:50 +0200 (Thu, 02 Aug 2012) New Revision: 215 Url: http://chorem.org/repositories/revision/chorem/215 Log: Spelling mistakes on dashboards Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-08-02 10:42:22 UTC (rev 214) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-08-02 11:54:50 UTC (rev 215) @@ -38,7 +38,7 @@ <th>Posted date</th> <th>Expected date</th> <th>Payment date</th> - <th>Attchment</th> + <th>Attachment</th> </tr> </thead> <c:forEach var="q" items="${invoices}"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp 2012-08-02 10:42:22 UTC (rev 214) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp 2012-08-02 11:54:50 UTC (rev 215) @@ -31,7 +31,7 @@ <th>Project</th> <th>Category</th> <th>Description</th> - <th>estimated days</th> + <th>Estimated days</th> <th>Amount</th> <th>working days</th> <th>Hoped price day</th> @@ -39,7 +39,7 @@ <th>Hoped profit</th> <th>Real profit</th> <th>Status</th> - <th>Attchment</th> + <th>Attachment</th> </tr> </thead> <c:forEach var="q" items="${quotations}"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2012-08-02 10:42:22 UTC (rev 214) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2012-08-02 11:54:50 UTC (rev 215) @@ -33,13 +33,13 @@ <th>Description</th> <th>Customer</th> <th>Supplier</th> - <th>estimated days</th> - <th>working days</th> - <th>task opened</th> - <th>task closed</th> + <th>Estimated days</th> + <th>Working days</th> + <th>Task opened</th> + <th>Task closed</th> <th>Amount</th> <th>Status</th> - <th>Attchment</th> + <th>Attachment</th> </tr> </thead> <c:forEach var="q" items="${quotations}"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2012-08-02 10:42:22 UTC (rev 214) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2012-08-02 11:54:50 UTC (rev 215) @@ -33,12 +33,12 @@ <th>Description</th> <th>Customer</th> <th>Supplier</th> - <th>estimated days</th> - <th>convsersion hope</th> - <th>hoped price day</th> + <th>Estimated days</th> + <th>Conversion hope</th> + <th>Hoped price day</th> <th>Amount</th> <th>Status</th> - <th>Attchment</th> + <th>Attachment</th> </tr> </thead> <c:forEach var="q" items="${quotations}"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp 2012-08-02 10:42:22 UTC (rev 214) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp 2012-08-02 11:54:50 UTC (rev 215) @@ -23,7 +23,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<h1>Vacances par employe</h1> +<h1>Vacances par employé</h1> <ul> <c:forEach var="q" items="${vacationByEmployee.keySet()}"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp 2012-08-02 10:42:22 UTC (rev 214) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp 2012-08-02 11:54:50 UTC (rev 215) @@ -23,7 +23,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<h1>Jour de travail sur des projets client par employe</h1> +<h1>Jour de travail sur des projets client par employé</h1> <ul> <c:forEach var="q" items="${workingProjectDaysByEmployee.keySet()}">

1 0

r214 - trunk/chorem-entities/src/main/xmi
by jcouteau＠users.chorem.org Aug. 2, 2012

Aug. 2, 2012

Author: jcouteau Date: 2012-08-02 12:42:22 +0200 (Thu, 02 Aug 2012) New Revision: 214 Url: http://chorem.org/repositories/revision/chorem/214 Log: fixes #733 : change string representation of an employee Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-02 10:41:15 UTC (rev 213) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-02 10:42:22 UTC (rev 214) @@ -52,9 +52,9 @@ org.chorem.entities.Time.class.tagvalue.version=7.0 org.chorem.entities.Time.class.tagvalue.preload=Time.task;Time.employee org.chorem.entities.Time.class.tagvalue.toString=%Time.employee$s - %Time.task$s - %Interval.beginDate$tF-%Interval.endDate$tF -org.chorem.entities.Employee.class.tagvalue.version=6.0 +org.chorem.entities.Employee.class.tagvalue.version=7.0 org.chorem.entities.Employee.class.tagvalue.preload=Employee.company;Employee.person -org.chorem.entities.Employee.class.tagvalue.toString=%Employee.company$s %Employee.person$s +org.chorem.entities.Employee.class.tagvalue.toString=%Employee.person$s (%Employee.company$s) org.chorem.entities.Employee.class.tagvalue.sortOrder=Employee.company,Employee.person org.chorem.entities.Goal.class.tagvalue.version=5.0 org.chorem.entities.Goal.class.tagvalue.toString=%Goal.name|noname$s @@ -97,7 +97,7 @@ org.chorem.entities.Quotation.class.tagvalue.preload=Quotation.project;Quotation.customer;Quotation.supplier;Quotation.category org.chorem.entities.Quotation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Quotation.reference|noref$s(%Quotation.category|noCategory$s) %Quotation.description|nodescription$s org.chorem.entities.Quotation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Quotation.reference,Quotation.type,Quotation.description -org.chorem.entities.Quotation.attribute.status.tagvalue.allowed=DRAFT,SEND,REJECTED,ACCEPTED,STARTED,DELIVERED,VRS,WARRANTY,CLOSED +org.chorem.entities.Quotation.attribute.status.tagvalue.allowed=DRAFT,SENT,REJECTED,ACCEPTED,STARTED,DELIVERED,VSR,WARRANTY,CLOSED org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.min=0 org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.max=100 org.chorem.entities.Invoice.class.tagvalue.version=8.0

1 0

r213 - trunk
by jcouteau＠users.chorem.org Aug. 2, 2012

Aug. 2, 2012

Author: jcouteau Date: 2012-08-02 12:41:15 +0200 (Thu, 02 Aug 2012) New Revision: 213 Url: http://chorem.org/repositories/revision/chorem/213 Log: stable mavenpom4redmine Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-01 16:08:48 UTC (rev 212) +++ trunk/pom.xml 2012-08-02 10:41:15 UTC (rev 213) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.4-SNAPSHOT</version> + <version>3.3.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r212 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org Aug. 1, 2012

Aug. 1, 2012

Author: bpoussin Date: 2012-08-01 18:08:48 +0200 (Wed, 01 Aug 2012) New Revision: 212 Url: http://chorem.org/repositories/revision/chorem/212 Log: Anomalie #714: Unable to see an invoice Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-08-01 10:34:21 UTC (rev 211) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-08-01 16:08:48 UTC (rev 212) @@ -45,7 +45,7 @@ <tbody> <tr> <td><a href="<c:url value="/wikitty/view/${q.target}"/>">${q.getTarget()}</a></td> - <td><a href="<c:url value="/wikitty/Quotation/view/${q.wikittyId}"/>">${q.reference}</a></td> + <td><a href="<c:url value="/wikitty/Invoice/view/${q.wikittyId}"/>">${q.reference}</a></td> <td>${q.description}</td> <td><a href="<c:url value="/wikitty/Employee/view/${q.customer}"/>">${q.getCustomer(false)}</a></td> <td><a href="<c:url value="/wikitty/Employee/view/${q.supplier}"/>">${q.getSupplier(false)}</a></td>

1 0

r211 - in trunk/chorem-webmotion/src/main: java/org/wikitty/web/jsptag webapp/js
by bpoussin＠users.chorem.org Aug. 1, 2012

Aug. 1, 2012

Author: bpoussin Date: 2012-08-01 12:34:21 +0200 (Wed, 01 Aug 2012) New Revision: 211 Url: http://chorem.org/repositories/revision/chorem/211 Log: essai de support de timepicker (sans date) Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java trunk/chorem-webmotion/src/main/webapp/js/chorem.js Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-08-01 10:28:10 UTC (rev 210) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-08-01 10:34:21 UTC (rev 211) @@ -174,12 +174,12 @@ if (date != null) { value = DateFormatUtils.format(date, "MM/yyyy"); } - /*{<input class="datetimepicker" type="date" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ + /*{<input class="monthpicker" type="date" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ } else if ("time".equals(field.getTagValue("subtype"))) { if (date != null) { value = DateFormatUtils.format(date, "HH:mm"); } - /*{<input class="datetimepicker" type="date" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ + /*{<input class="timepicker" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ } else if ("datetime".equals(field.getTagValue("subtype"))) { if (date != null) { value = DateFormatUtils.format(date, "dd/MM/yyyy HH:mm"); Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2012-08-01 10:28:10 UTC (rev 210) +++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2012-08-01 10:34:21 UTC (rev 211) @@ -33,7 +33,7 @@ }); // tout ce qui aura la classe datetimepicker servira a editer une date avec heure $(function() { - $( ".datetimepicker" ).datetimepicker($.datepicker.regional['fr']); + $( ".datetimepicker" ).datetimepicker($.datetimepicker.regional['fr']); $( ".datetimepicker" ).datetimepicker({ showWeek: true, firstDay: 1, @@ -42,6 +42,16 @@ }); // "option", "gotoCurrent", true ); }); +$(function() { + $( ".timepicker" ).timepicker($.timepicker.regional['fr']); + $( ".timepicker" ).timepicker({ + showWeek: true, + firstDay: 1, + changeMonth: true, + changeYear: true + }); +// "option", "gotoCurrent", true ); +}); // nouveau composant pour afficher les wikitties lors de l'edition classe par extension $.widget( "custom.autocompleteByExtension", $.ui.autocomplete, {

1 0

r210 - in trunk: chorem-entities/src/main/xmi chorem-webmotion/src/main/java/org/wikitty/web/jsptag chorem-webmotion/src/main/webapp/js
by bpoussin＠users.chorem.org Aug. 1, 2012

Aug. 1, 2012

Author: bpoussin Date: 2012-08-01 12:28:10 +0200 (Wed, 01 Aug 2012) New Revision: 210 Url: http://chorem.org/repositories/revision/chorem/210 Log: Anomalie #713: Unable to enter any date - change subtime (bad) with subtype (ggod as describe in wikitty tag/value api) - change date input type to text - try to enhance calendar with week number Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java trunk/chorem-webmotion/src/main/webapp/js/chorem.js Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-07-12 17:32:01 UTC (rev 209) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-01 10:28:10 UTC (rev 210) @@ -38,11 +38,11 @@ org.chorem.entities.Person.class.tagvalue.version=5.0 org.chorem.entities.Person.class.tagvalue.toString=%Person.lastName$s %Person.firstName|noname$s org.chorem.entities.Person.class.tagvalue.sortOrder=Person.lastName,Person.firstName -org.chorem.entities.Interval.class.tagvalue.version=6.0 +org.chorem.entities.Interval.class.tagvalue.version=7.0 org.chorem.entities.Interval.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF org.chorem.entities.Interval.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate -org.chorem.entities.Interval.attribute.beginDate.tagvalue.subtime=datetime -org.chorem.entities.Interval.attribute.endDate.tagvalue.subtime=datetime +org.chorem.entities.Interval.attribute.beginDate.tagvalue.subtype=datetime +org.chorem.entities.Interval.attribute.endDate.tagvalue.subtype=datetime org.chorem.entities.Company.class.tagvalue.version=5.0 org.chorem.entities.Company.class.tagvalue.toString=%Company.name|noname$s org.chorem.entities.Company.class.tagvalue.sortOrder=Company.name Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2012-07-12 17:32:01 UTC (rev 209) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2012-08-01 10:28:10 UTC (rev 210) @@ -145,7 +145,11 @@ String pattern = field.getPattern(); value = DateFormatUtils.format(date, pattern); } else if (date != null) { - if ("datetime".equals(field.getTagValue("subtime"))) { + if ("month".equals(field.getTagValue("subtype"))) { + value = DateFormatUtils.format(date, "MM/yyyy"); + } else if ("time".equals(field.getTagValue("subtype"))) { + value = DateFormatUtils.format(date, "hh:mm"); + } else if ("datetime".equals(field.getTagValue("subtype"))) { value = DateFormatUtils.format(date, "dd/MM/yyyy hh:mm"); } else { value = DateFormatUtils.format(date, "dd/MM/yyyy"); Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-07-12 17:32:01 UTC (rev 209) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-08-01 10:28:10 UTC (rev 210) @@ -170,13 +170,26 @@ throws JspException, IOException { Date date = wikitty.getFieldAsDate(extName, fieldName); String value = ""; - if (date != null) { - value = DateFormatUtils.format(date, "dd/MM/yyyy HH:mm"); - } - if ("datetime".equals(field.getTagValue("subtime"))) { + if ("month".equals(field.getTagValue("subtype"))) { + if (date != null) { + value = DateFormatUtils.format(date, "MM/yyyy"); + } /*{<input class="datetimepicker" type="date" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ + } else if ("time".equals(field.getTagValue("subtype"))) { + if (date != null) { + value = DateFormatUtils.format(date, "HH:mm"); + } + /*{<input class="datetimepicker" type="date" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ + } else if ("datetime".equals(field.getTagValue("subtype"))) { + if (date != null) { + value = DateFormatUtils.format(date, "dd/MM/yyyy HH:mm"); + } + /*{<input class="datetimepicker" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ } else { - /*{<input class="datepicker" type="date" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ + if (date != null) { + value = DateFormatUtils.format(date, "dd/MM/yyyy"); + } + /*{<input class="datepicker" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ } } Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2012-07-12 17:32:01 UTC (rev 209) +++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2012-08-01 10:28:10 UTC (rev 210) @@ -23,12 +23,24 @@ // tout ce qui aura la classe datepicker servira a editer une date $(function() { $( ".datepicker" ).datepicker($.datepicker.regional['fr']); - $( ".datepicker" ).datepicker( "option", "gotoCurrent", true ); + $( ".datepicker" ).datepicker({ + showWeek: true, + firstDay: 1, + changeMonth: true, + changeYear: true + }); +// "option", "gotoCurrent", true ); }); // tout ce qui aura la classe datetimepicker servira a editer une date avec heure $(function() { - $( ".datetimepicker" ).datetimepicker($.timepicker.regional['fr']); - $( ".datetimepicker" ).datetimepicker( "option", "gotoCurrent", true ); + $( ".datetimepicker" ).datetimepicker($.datepicker.regional['fr']); + $( ".datetimepicker" ).datetimepicker({ + showWeek: true, + firstDay: 1, + changeMonth: true, + changeYear: true + }); +// "option", "gotoCurrent", true ); }); // nouveau composant pour afficher les wikitties lors de l'edition classe par extension

1 0

r209 - trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions
by bpoussin＠users.chorem.org July 12, 2012

July 12, 2012

Author: bpoussin Date: 2012-07-12 19:32:01 +0200 (Thu, 12 Jul 2012) New Revision: 209 Url: http://chorem.org/repositories/revision/chorem/209 Log: fix null pointer Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-07-12 16:51:03 UTC (rev 208) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-07-12 17:32:01 UTC (rev 209) @@ -178,18 +178,20 @@ } } } - + List<String> extExcluded = client.getConfig().getOptionAsList( ChoremConfigOption.CHOREM_EXTENSION_SEARCH_EXCLUSION.key).getOption(); for (String ext : extExcluded) { map.removeAll(ext); } - for (String ext : extension) { - // The wanted extensions should be present, even without wikitties... - Set<Wikitty> wikitties = map.get(ext); - if (wikitties == null || wikitties.isEmpty() ) { - map.put(ext, null); + if (extension != null) { + for (String ext : extension) { + // The wanted extensions should be present, even without wikitties... + Set<Wikitty> wikitties = map.get(ext); + if (wikitties == null || wikitties.isEmpty() ) { + map.put(ext, null); + } } } return map;

1 0

r208 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org July 12, 2012

July 12, 2012

Author: bpoussin Date: 2012-07-12 18:51:03 +0200 (Thu, 12 Jul 2012) New Revision: 208 Url: http://chorem.org/repositories/revision/chorem/208 Log: am?\195?\169lioration du doctype (declaration xhtml5) voir https://fr.wikipedia.org/wiki/HTML5#XHTML_5 Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-07-12 16:29:14 UTC (rev 207) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-07-12 16:51:03 UTC (rev 208) @@ -23,12 +23,14 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE html> -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Chorem</title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> + <meta charset="UTF-8"/> <%-- JQuery --%> <link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>

1 0

r207 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org July 12, 2012

July 12, 2012

Author: bpoussin Date: 2012-07-12 18:29:14 +0200 (Thu, 12 Jul 2012) New Revision: 207 Url: http://chorem.org/repositories/revision/chorem/207 Log: add Contact details in Contact menu Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-07-12 16:24:06 UTC (rev 206) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-07-12 16:29:14 UTC (rev 207) @@ -85,6 +85,9 @@ <li><a href="<c:url value="/wikitty/Employee/search"/>"><i class="icon-th-list icon-black"></i> All employee</a></li> <li><a href="<c:url value="/wikitty/Employee/edit/new"/>"><i class="icon-plus icon-black"></i> Add employee</a></li> <li class="divider"></li> + <li><a href="<c:url value="/wikitty/ContactDetails/search"/>"><i class="icon-th-list icon-black"></i> All contact details</a></li> + <li><a href="<c:url value="/wikitty/ContactDetails/edit/new"/>"><i class="icon-plus icon-black"></i> Add contact details</a></li> + <li class="divider"></li> <li><a href="<c:url value="/wikitty/Touch/search"/>"><i class="icon-th-list icon-black"></i> All touch</a></li> <li><a href="<c:url value="/wikitty/Touch/edit/new"/>"><i class="icon-plus icon-black"></i> Add touch</a></li> </ul>

1 0