You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/10/19 17:41:39 UTC
svn commit: r706035 - in
/ofbiz/trunk/applications/manufacturing/webapp/manufacturing:
WEB-INF/actions/routing/EditCalendarExceptionDay.groovy
WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy
routing/CalendarForms.xml
Author: jleroux
Date: Sun Oct 19 08:41:39 2008
New Revision: 706035
URL: http://svn.apache.org/viewvc?rev=706035&view=rev
Log:
Fix "Wrong lists in Calendar" (https://issues.apache.org/jira/browse/OFBIZ-2002) - OFBIZ-2002
2d bug I forgot, reminded by Adrian
+ fix Postgres+TimeStamp issues in week and day groovy files
+ better labels for selected
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy?rev=706035&r1=706034&r2=706035&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy Sun Oct 19 08:41:39 2008
@@ -49,6 +49,8 @@
context.addCalendarExceptionDayWrapper = addCalendarExceptionDayWrapper;
exceptionDateStartTime = parameters.exceptionDateStartTime ?: request.getAttribute("exceptionDateStartTime");
+exceptionDateStartTime = ObjectType.simpleTypeConvert(exceptionDateStartTime, "Timestamp", null, null);
+
if (exceptionDateStartTime) {
calendarExceptionDay = delegator.findByPrimaryKey("TechDataCalendarExcDay", [calendarId : calendarId , exceptionDateStartTime : exceptionDateStartTime]);
if (calendarExceptionDay) {
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy?rev=706035&r1=706034&r2=706035&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy Sun Oct 19 08:41:39 2008
@@ -19,6 +19,7 @@
import org.ofbiz.widget.html.HtmlFormWrapper;
+import org.ofbiz.base.util.*;
if(security.hasEntityPermission("MANUFACTURING", "_VIEW", session)) {
context.hasPermission = Boolean.TRUE;
@@ -29,10 +30,10 @@
calendarExceptionWeeks = [];
calendarId = parameters.calendarId ?: request.getAttribute("calendarId");;
-if (calendarId != null) {
+if (calendarId) {
techDataCalendar = delegator.findByPrimaryKey("TechDataCalendar", [calendarId : calendarId]);
}
-if (techDataCalendar != null) {
+if (techDataCalendar) {
calendarExceptionWeeks = techDataCalendar.getRelated("TechDataCalendarExcWeek");
}
calendarExceptionWeeksDatas = [];
@@ -52,6 +53,8 @@
context.addCalendarExceptionWeekWrapper = addCalendarExceptionWeekWrapper;
exceptionDateStart = parameters.exceptionDateStart ?: request.getAttribute("exceptionDateStart");
+exceptionDateStart = ObjectType.simpleTypeConvert(exceptionDateStart, "Timestamp", null, null);
+
if (exceptionDateStart) {
calendarExceptionWeek = delegator.findByPrimaryKey("TechDataCalendarExcWeek", [calendarId : calendarId , exceptionDateStart : exceptionDateStart]);
if (calendarExceptionWeek) {
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml?rev=706035&r1=706034&r2=706035&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml Sun Oct 19 08:41:39 2008
@@ -45,14 +45,13 @@
</form>
<form name="ListCalendarExceptionDay" type="list" target="UpdateCalendarExceptionDay" title="" list-name="calendarExceptionDays"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <auto-fields-service service-name="updateCalendarExceptionDay" map-name="calendarExceptionDay"/>
<field name="calendarId"><hidden/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="exceptionDateStartTime" title="${uiLabelMap.ManufacturingExceptionDateStartTime}"><display/></field>
<field name="exceptionCapacity" title="${uiLabelMap.ManufacturingCalendarCapacity}" ><display/></field>
<field name="updateLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="EditCalendarExceptionDay?calendarId=${calendarId}&exceptionDateStartTime=${exceptionDateStartTime}"
- description="${uiLabelMap.CommonSelected}" />
+ description="${uiLabelMap.CommonSelect}" />
</field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="RemoveCalendarExceptionDay?calendarId=${calendarId}&exceptionDateStartTime=${exceptionDateStartTime}"
@@ -96,7 +95,7 @@
</field>
<field name="updateLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="EditCalendarExceptionWeek?calendarId=${calendarExceptionWeek.calendarId}&exceptionDateStart=${calendarExceptionWeek.exceptionDateStart}"
- description="${uiLabelMap.CommonSelected}" />
+ description="${uiLabelMap.CommonSelect}" />
</field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="RemoveCalendarExceptionWeek?calendarId=${calendarExceptionWeek.calendarId}&exceptionDateStart=${calendarExceptionWeek.exceptionDateStart}"