Changeset 1856

Timestamp:

5 Jun 2007, 13:06:23 (17 years ago)

Author:

joachim

Message:

aviod conflict errors (in custom)

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/layouts/student_course_result.xml (modified) (1 diff)
• skins/waeup_epayment/pay_by_sc.py (modified) (1 diff)
• skins/waeup_student/check_admission.py (modified) (1 diff)
• skins/waeup_student/create_level.py (modified) (7 diffs)

WAeUP_SRP/trunk/profiles/default/layouts/student_course_result.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="layout.xsl"?>
 <object name="student_course_result" meta_type="CPS Layout">
  <property name="layout_create_method"></property>

WAeUP_SRP/trunk/skins/waeup_epayment/pay_by_sc.py

@@ -45 +45 @@
                       layout_mode="create",
                       formaction = "pay_by_sc",
-                      button = 'Pay'
+                      button = 'Pay',
+                      commit = False,
                       )
 if psm == 'invalid':

WAeUP_SRP/trunk/skins/waeup_student/check_admission.py

@@ -30 +30 @@
                       formaction = "check_admission",
                       button = "Check",
+                      commit=False,
                       )
 if psm == 'invalid':

WAeUP_SRP/trunk/skins/waeup_student/create_level.py

@@ -37 +37 @@
 create_level =  request.get('create_level',None)
 
-if context.hasObject(current_level) and create_level :
-    logger.info('%s tried to add already existing level %s' % (student.id,current_level))
-    return
+##if context.hasObject(current_level) and create_level:
+##    if getattr(context,current_level).objectIds():
+##        logger.info('%s tried to add already existing level %s' % (student.id,current_level))
+##    return
 logger.info('%s started to create level %s' % (student.id,current_level))
 
@@ -53 +54 @@
 ##        return
 
-if level_created == current_level:
+if context.hasObject(current_level):
     level = getattr(context,"%s" % current_level)
 else:
@@ -62 +63 @@
     level.getContent().edit(mapping={'session': study_session})
     context.portal_workflow.doActionFor(level,'close_for_edit')
+    context.waeup_tool.doCommit()
 results = []
 if student.matric_no:
@@ -75 +77 @@
 
     for co in carry_overs:
+        cr_id = "%s_co" % co.CosCode
+        if level.hasObject(cr_id):    #already created
+            continue
         carry_over = False
         query = Eq('code',co.CosCode)
@@ -105 +110 @@
         context.portal_workflow.doActionFor(course_result,'open')
         course_result.getContent().edit(mapping=d)
-        #context.waeup_tool.doCommit()
+        context.waeup_tool.doCommit()
 #level['create_course_results'](cert_id,current_level)
 res = context.portal_catalog(portal_type="Certificate", id = cert_id)
@@ -117 +122 @@
     courses = aq_portal(query)
     for c in courses:
+        cr_id = "%s" % c.getId
+        if level.hasObject(cr_id):    #already created
+            continue
         d = context.getCourseInfo(c.getId)
         cr_id = level.invokeFactory('StudentCourseResult',c.getId)
@@ -123 +131 @@
         d['core_or_elective'] = getattr(c.getObject().getContent(),'core_or_elective')
         course_result.getContent().edit(mapping=d)
-        #context.waeup_tool.doCommit()
+        context.waeup_tool.doCommit()
 logger.info('%s finished to create level %s' % (student.id,current_level))
 return response.redirect("%s/%s" % (context.absolute_url(),current_level))