Changeset 1433

Timestamp:

03/11/11 11:29:03 (15 months ago)

Author:

winfried

Message:

- Prettifying the list of openings hours
- Changing the light config to user the admin variant of the user management,
that one is far better tested and has less bugs.

Location:

HelpIM3/branches/chatgroups

Files:

• HelpIM/chat/pages/ShowOpenSchedule.py (modified) (1 diff)
• config/sites/light.xml (modified) (4 diffs)

HelpIM3/branches/chatgroups/HelpIM/chat/pages/ShowOpenSchedule.py

@@ -30 +30 @@
         order_by = ['chat_shift_dayOfWeek', 'chat_shift_start_time']
         shiftsList = self.site.getTableData('Table_Data', 'Table_Record', self.site.getShiftList(self.site, order_by=['chat_shift_dayOfWeek', 'chat_shift_start_time']), shiftDataElements, fieldsAsAttributes)
-        self.log.debug("*************  " + str(shiftsList['Table_Data'][1])) #[0]['Table_Record']))
         for i in range(len(shiftsList['Table_Data'][1])):
             shiftsList['Table_Data'][1][i]['Table_Record'][0]["chat_shift_start_time"] = shiftsList['Table_Data'][1][i]['Table_Record'][0]["chat_shift_start_time"][:-3] + " uur"

HelpIM3/branches/chatgroups/config/sites/light.xml

@@ -36 +36 @@
                         <actionResult name="actionResult_SUCCESS" target="home" />
                 </actionPerformed>
-                <actionPerformed name="AddUser">
-                        <actionResult name="actionResult_SUCCESS" target="ShowUsers" />
+                <actionPerformed name="AddUser_Admin">
+                        <actionResult name="actionResult_SUCCESS" target="ShowUsers_Admin" />
                 </actionPerformed>
-                <actionPerformed name="EditUser">
-                        <actionResult name="actionResult_SUCCESS" target="ShowUsers" />
+                <actionPerformed name="EditUser_Admin">
+                        <actionResult name="actionResult_SUCCESS" target="ShowUsers_Admin" />
                 </actionPerformed>
         </listOf__actionPerformed>
@@ -46 +46 @@
         <listOf__page>
                 <!-- Authorisation-->
-                <page location="ShowUsers" module="auth" script="ShowUsers"
+                <page location="ShowUsers_Admin" module="auth" script="ShowUsers_Admin"
                         allowCookies="True" />
-                <page location="AddUser" module="auth" script="AddUser"
+                <page location="AddUser_Admin" module="auth" script="AddUser_Admin"
                         allowCookies="True" />
-                <page location="EditUser" module="auth" script="EditUser"
+                <page location="EditUser_Admin" module="auth" script="EditUser_Admin"
                         allowCookies="True" />
                 <page location="chgPwd" module="auth" script="ChangePassword"
@@ -136 +136 @@
                 <AuthorizedLocation key="EndCareWorkerChat" />
                 <!-- Authorisation-->
-                <AuthorizedLocation key="ShowUsers" />
-                <AuthorizedLocation key="AddUser" />
-                <AuthorizedLocation key="EditUser" />
+                <AuthorizedLocation key="ShowUsers_Admin" />
+                <AuthorizedLocation key="AddUser_Admin" />
+                <AuthorizedLocation key="EditUser_Admin" />
                 <!-- Editing Intranet -->
                 <AuthorizedLocation key="Edithome" />
@@ -150 +150 @@
         <menuEntry action="ShowChats" title="Gesprekken" />
         <menuEntry action="StartCareWorkerChat" title="Chat" />
-        <menuEntry action="ShowUsers" title="Gebruikers" />
+        <menuEntry action="ShowUsers_Admin" title="Gebruikers" />
 
         <Text id="ChatStartErrorText" value="Er was een probleem bij het openen van de chat, sluit dit venster en probeer opnieuw." />