Changeset 1082 for WAeUP_SRP/trunk/skins

Timestamp:

18 Dec 2006, 21:25:01 (18 years ago)

Author:

Henrik Bettermann

Message:

logging messages changed

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_custom/logged_in.py (modified) (3 diffs)
• waeup_custom/logout.py (modified) (1 diff)
• waeup_pins/disable_pins.py (modified) (1 diff)
• waeup_pins/enable_pins.py (modified) (1 diff)
• waeup_student/application_view.pt (modified) (2 diffs)
• waeup_student/clearance_edit.py (modified) (1 diff)
• waeup_student/getApplicationInfo.py (modified) (1 diff)
• waeup_student/getClearanceInfo.py (modified) (1 diff)
• waeup_student/getStudentInfo.py (modified) (1 diff)
• waeup_student/raise_objection.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -16 +16 @@
 current = DateTime.DateTime()
 import logging
-logger = logging.getLogger('Student.Login')
+logger = logging.getLogger('Member.Login')
 
 
@@ -106 +106 @@
         else:
             to_member_home, to_workspaces = checkRedirect(portal, mtool)
+
 if (not to_member_home) and (not to_workspaces):
     redirect_to_portal = True
@@ -124 +125 @@
 elif to_member_home:
     redirect_url = mtool.getHomeFolder().absolute_url()
+    logger.info('"%s", "logged in"' % (member))
 elif to_workspaces:
     redirect_url = portal.workspaces.absolute_url()
+    logger.info('"%s", "logged in"' % (member))    
 elif redirect_to_portal:
     redirect_url = portal_absolute_url
+    logger.info('"%s", "logged in"' % (member))
 
 REQUEST = context.REQUEST

WAeUP_SRP/trunk/skins/waeup_custom/logout.py

@@ -10 +10 @@
 # notify the event service that the user has logged out
 import logging
-logger = logging.getLogger('Logout')
+logger = logging.getLogger('Member.Logout')
 user = context.portal_membership.getAuthenticatedMember()
 if user:

WAeUP_SRP/trunk/skins/waeup_pins/disable_pins.py

@@ -15 +15 @@
 current = DateTime.DateTime().strftime("%d-%m-%y_%H_%M_%S")
 import logging
-logger = logging.getLogger('getStudentInfo')
+logger = logging.getLogger('Pin.Disable')
 
 request = REQUEST

WAeUP_SRP/trunk/skins/waeup_pins/enable_pins.py

@@ -15 +15 @@
 current = DateTime.DateTime().strftime("%d-%m-%y_%H_%M_%S")
 import logging
-logger = logging.getLogger('getStudentInfo')
+logger = logging.getLogger('Pin.Enable')
 
 request = REQUEST

WAeUP_SRP/trunk/skins/waeup_student/application_view.pt

@@ -1 +1 @@
 <metal:html tal:define="info context/getStudentInfo">
+  <span tal:condition="not: info">
+    <metal:block use-macro="here/illegal_view/macros/illegal_view" />
+  </span>
+  <metal:block tal:condition="info"> 
   <metal:body use-macro="here/waeup_content_master/macros/master">
     <metal:main fill-slot="main">
@@ -28 +32 @@
     </metal:main>
   </metal:body>
+  </metal:block>
 </metal:html>

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py

@@ -16 +16 @@
 current = DateTime.DateTime()
 import logging
-logger = logging.getLogger('Student.Clearance')
+logger = logging.getLogger('Student.Clearance.Edit')
 
 cpsdocument_edit_button = REQUEST.has_key('cpsdocument_edit_button')

WAeUP_SRP/trunk/skins/waeup_student/getApplicationInfo.py

@@ -13 +13 @@
 """
 import logging
-logger = logging.getLogger('getApplicationInfo')
+logger = logging.getLogger('Student.Application.Info')
 
 request = context.REQUEST

WAeUP_SRP/trunk/skins/waeup_student/getClearanceInfo.py

@@ -13 +13 @@
 """
 import logging
-logger = logging.getLogger('getClearanceInfo')
+logger = logging.getLogger('Student.Clearance.Info')
 
 request = context.REQUEST

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -21 +21 @@
 
 import logging
-logger = logging.getLogger('getStudentInfo')
+logger = logging.getLogger('Student.Info')
 
 info = {}

WAeUP_SRP/trunk/skins/waeup_student/raise_objection.py

@@ -14 +14 @@
 import DateTime
 import logging
-logger = logging.getLogger('raise_objection')
+logger = logging.getLogger('Student.Objection')
 
 wf = context.portal_workflow