Changeset 1558 for WAeUP_SRP/branches/joachim-event-branch/skins/waeup_default

Timestamp:

15 Mar 2007, 16:44:41 (18 years ago)

Author:

joachim

Message:

merged trunk up to 1557

Location:

WAeUP_SRP/branches/joachim-event-branch/skins/waeup_default

Files:

• isCourseAdviser.py (modified) (1 diff)
• waeup_edit.py (modified) (1 diff)

WAeUP_SRP/branches/joachim-event-branch/skins/waeup_default/isCourseAdviser.py

@@ -16 +16 @@
 mtool = context.portal_membership
 roles = mtool.getAuthenticatedMember().getRolesInContext(context)
+<<<<<<< .working
+return str("CourseAdviser" in roles)
+=======
+return str("CourseAdviser" in roles)
 return "CourseAdviser" in roles
+>>>>>>> .merge-rechts.r1557
 

WAeUP_SRP/branches/joachim-event-branch/skins/waeup_default/waeup_edit.py

@@ -42 +42 @@
 if is_valid:
     comments = REQUEST.get('comments')
-    context.cpsdocument_notify_modification(comments=comments)
+    #context.cpsdocument_notify_modification(comments=comments)
     if context.portal_type == "StudentStudyCourse":
         course = ds.get('study_course')