Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / branch_office / admin_form_branch_opening_time.tpl

diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl
index a88861b0b3c927913726c40d94e7649b07e699ae..4af4b8665bfb8c3f6f308e0674c600c7887ea1c2 100644 (file)
--- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl
+++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl
@@ -22,33 +22,49 @@
 
                        <p:selectOneMenu
                                id="openingStartDay"
-                               value="#{adminBranchOfficeController.openingStartDay}"
+                               value="#{adminBranchOfficeActionController.openingStartDay}"
                                filter="true"
                                filterMatchMode="contains"
                                required="true"
                                requiredMessage="#{msg.ADMIN_START_WEEK_DAY_REQUIRED}"
                                >
+
                                <f:converter converterId="DayOfTheWeekConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+                               <f:selectItems
+                                       value="#{dataController.dayOfTheWeek}"
+                                       var="dayOfWeek"
+                                       itemValue="#{dayOfWeek}"
+                                       itemLabel="#{dayOfWeek.toString()}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:selectOneMenu
                                id="openingEndDay"
-                               value="#{adminBranchOfficeController.openingEndDay}"
+                               value="#{adminBranchOfficeActionController.openingEndDay}"
                                filter="true"
                                filterMatchMode="contains"
                                required="true"
                                requiredMessage="#{msg.ADMIN_END_WEEK_DAY_REQUIRED}"
                                >
+
                                <f:converter converterId="DayOfTheWeekConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+                               <f:selectItems
+                                       value="#{dataController.dayOfTheWeek}"
+                                       var="dayOfWeek"
+                                       itemValue="#{dayOfWeek}"
+                                       itemLabel="#{dayOfWeek.toString()}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:calendar
                                id="openingStartTime"
-                               value="#{adminBranchOfficeController.openingStartTime}"
+                               value="#{adminBranchOfficeActionController.openingStartTime}"
                                pattern="HH:mm"
                                timeOnly="true"
                                stepMinute="5"
@@ -59,7 +75,7 @@
 
                        <p:calendar
                                id="openingEndTime"
-                               value="#{adminBranchOfficeController.openingEndTime}"
+                               value="#{adminBranchOfficeActionController.openingEndTime}"
                                pattern="HH:mm"
                                timeOnly="true"
                                stepMinute="5"