Changeset 1871


Ignore:
Timestamp:
8 Jun 2007, 18:57:59 (17 years ago)
Author:
Henrik Bettermann
Message:

ticket #264

other occurences

Location:
WAeUP_SRP/trunk/skins
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/skins/waeup_accommodation/getAccommodationInfo.py

    r1780 r1871  
    7171info['id'] = student_id
    7272info['student'] = student
    73 review_state = info['review_state'] = wf.getInfoFor(student,'review_state',None)
     73review_state = info['review_state'] = context.getStudentReviewState()
    7474booking_allowed = False
    7575if review_state in ('cleared_and_validated','returning','school_fee_paid','courses_registered', 'courses_validated',):

  • WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

    r1841 r1871  
    6868            payments.getContent().edit(mapping=d)
    6969        student_pume = getattr(student,'pume',None)
    70         s_review_state = wftool.getInfoFor(student,'review_state',None)
     70        s_review_state = context.getStudentReviewState()
    7171        a_review_state = wftool.getInfoFor(student_app,'review_state',None)
    7272        student_per = getattr(student,'personal',None)

  • WAeUP_SRP/trunk/skins/waeup_epayment/check_transactions.py

    r1625 r1871  
    7575            logger.info('payment object of %s closed' % (student_id))
    7676            continue
    77         review_state = wftool.getInfoFor(student_obj,'review_state',None)
     77        review_state = context.getStudentReviewState()
    7878        if review_state != "cleared_and_validated":
    7979            logger.info('%s review_state = %s' % (student_id,review_state))

  • WAeUP_SRP/trunk/skins/waeup_student/getApplicationInfo.py

    r1571 r1871  
    4141info['id'] = student_id
    4242info['student'] = student
    43 info['review_state'] = wf.getInfoFor(student,'review_state',None)
     43info['review_state'] = context.getStudentReviewState()
    4444info['app'] = student.application
    4545info['app_doc'] = student.application.getContent()

  • WAeUP_SRP/trunk/skins/waeup_student/getClearanceInfo.py

    r1571 r1871  
    4747info['id'] = student_id
    4848info['student'] = student
    49 info['review_state'] = wf.getInfoFor(student,'review_state',None)
     49info['review_state'] = context.getStudentReviewState()
    5050info['app'] = student.application
    5151info['app_doc'] = student.application.getContent()

  • WAeUP_SRP/trunk/skins/waeup_student/getCourseResultInfo.py

    r1861 r1871  
    4444##    info['review_state'] = res[0].review_state
    4545info['id'] = student_id
    46 info['review_state'] = wf.getInfoFor(student,'review_state',None)
     46info['review_state'] = context.getStudentReviewState()
    4747#info['per'] = student.personal
    4848info['course_doc'] = context.getContent()

  • WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py

    r1571 r1871  
    4444    info['student'] = student
    4545    info['id'] = student_id
    46     info['review_state'] = wf.getInfoFor(student,'review_state',None)
     46    info['review_state'] = context.getStudentReviewState()
    4747    info['per'] = student.personal
    4848    info['app'] = student.application

  • WAeUP_SRP/trunk/skins/waeup_student/getPersonalInfo.py

    r1571 r1871  
    4444##    info['review_state'] = res[0].review_state
    4545info['id'] = student_id
    46 info['review_state'] = wf.getInfoFor(student,'review_state',None)
     46info['review_state'] = context.getStudentReviewState()
    4747info['per'] = student.personal
    4848info['per_doc'] = student.personal.getContent()

  • WAeUP_SRP/trunk/skins/waeup_student/getStudentFolderInfo.py

    r1571 r1871  
    5353for field in context.students_catalog.schema():
    5454    info[field] = getattr(st_brain,field)
    55 res = context.portal_catalog(portal_type='Student',id = student_id)
    56 if res:
    57     info['review_state'] = res[0].review_state
     55
     56#res = context.portal_catalog(portal_type='Student',id = student_id)
     57#if res:
     58#    info['review_state'] = res[0].review_state
     59
     60info['review_state'] = context.getStudentReviewState()
    5861
    5962info['session'] = False

  • WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

    r1571 r1871  
    6363##student = brain.getObject()
    6464
    65 info['review_state'] = wf.getInfoFor(student,'review_state',None)
     65info['review_state'] = context.getStudentReviewState()
    6666info['student'] = student
    6767info['id'] = student.getId()

  • WAeUP_SRP/trunk/skins/waeup_student/getStudentWorkflowInfo.py

    r1427 r1871  
    2727#info['student'] = student
    2828info['url'] = student.absolute_url()
    29 review_state = info['review_state'] = wf.getInfoFor(student,'review_state',None)
     29review_state = info['review_state'] = context.getStudentReviewState()
    3030info['cr'] = review_state in  ('returning',
    3131                                           'school_fee_paid',

  • WAeUP_SRP/trunk/skins/waeup_student/get_searchable_student_states.py

    r1557 r1871  
    1 ## Script (Python) "get_searchable_review_states"
     1## Script (Python) "get_searchable_student_states"
    22##bind container=container
    33##bind context=context
Note: See TracChangeset for help on using the changeset viewer.