You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2016/09/17 11:06:50 UTC
svn commit: r1761196 - in /ofbiz/trunk/applications/manufacturing/template/routing: EditCalendarExceptionDay.ftl EditCalendarExceptionWeek.ftl

Author: jacopoc
Date: Sat Sep 17 11:06:50 2016
New Revision: 1761196

URL: http://svn.apache.org/viewvc?rev=1761196&view=rev
Log:
Fix for: two broken screen Edit Calendar Exception day and week.
(OFBIZ-8222)

Thanks: Avnindra Sharma for the report and the patch.

Modified:
    ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionDay.ftl
    ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionWeek.ftl

Modified: ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionDay.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionDay.ftl?rev=1761196&r1=1761195&r2=1761196&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionDay.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionDay.ftl Sat Sep 17 11:06:50 2016
@@ -25,7 +25,7 @@ under the License.
     [${uiLabelMap.CommonId} ${techDataCalendar.calendarId!}]</h3>
   </div>
   <div class="screenlet-body">
-    ${setRequestAttribute("calendarExceptionDays", calendarExceptionDays)}
+    ${setRequestAttribute("calendarExceptionDays", calendarExceptionDays!)}
     ${screens.render("component://manufacturing/widget/manufacturing/CalendarScreens.xml#ListCalendarExceptionDay")}
   </div>
 </div>
@@ -35,7 +35,7 @@ under the License.
     <h3>${uiLabelMap.PageTitleEditCalendarExceptionWeek}</h3>
   </div>
   <div class="screenlet-body">
-    ${setRequestAttribute("calendarExceptionDay", calendarExceptionDay)}
+    ${setRequestAttribute("calendarExceptionDay", calendarExceptionDay!)}
     ${screens.render("component://manufacturing/widget/manufacturing/CalendarScreens.xml#UpdateCalendarExceptionDay")}
   </div>
 </div>
@@ -45,7 +45,7 @@ under the License.
     <h3>${uiLabelMap.PageTitleAddCalendarExceptionWeek}</h3>
   </div>
   <div class="screenlet-body">
-    ${setRequestAttribute("techDataCalendar", techDataCalendar)}
+    ${setRequestAttribute("techDataCalendar", techDataCalendar!)}
     ${screens.render("component://manufacturing/widget/manufacturing/CalendarScreens.xml#AddCalendarExceptionDay")}
   </div>
 </div>

Modified: ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionWeek.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionWeek.ftl?rev=1761196&r1=1761195&r2=1761196&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionWeek.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionWeek.ftl Sat Sep 17 11:06:50 2016
@@ -25,7 +25,7 @@ under the License.
     [${uiLabelMap.CommonId} ${techDataCalendar.calendarId!}]</h3>
   </div>
   <div class="screenlet-body">
-    ${setRequestAttribute("calendarExceptionWeeksDatas", calendarExceptionWeeksDatas)}
+    ${setRequestAttribute("calendarExceptionWeeksDatas", calendarExceptionWeeksDatas!)}
     ${screens.render("component://manufacturing/widget/manufacturing/CalendarScreens.xml#ListCalendarExceptionWeek")}
   </div>
 </div>
@@ -35,7 +35,7 @@ under the License.
         <h3>${uiLabelMap.PageTitleEditCalendarExceptionWeek}</h3>
       </div>
       <div class="screenlet-body">
-        ${setRequestAttribute("calendarExceptionWeek", calendarExceptionWeek)}
+        ${setRequestAttribute("calendarExceptionWeek", calendarExceptionWeek!)}
         ${screens.render("component://manufacturing/widget/manufacturing/CalendarScreens.xml#UpdateCalendarExceptionWeek")}
       </div>
     </div>
@@ -45,7 +45,7 @@ under the License.
         <h3>${uiLabelMap.PageTitleAddCalendarExceptionWeek}</h3>
       </div>
       <div class="screenlet-body">
-        ${setRequestAttribute("techDataCalendar", techDataCalendar)}
+        ${setRequestAttribute("techDataCalendar", techDataCalendar!)}
         ${screens.render("component://manufacturing/widget/manufacturing/CalendarScreens.xml#AddCalendarExceptionWeek")}
       </div>
     </div>