Ignore:
Timestamp:
21 Sep 2012, 08:19:35 (12 years ago)
Author:
uli
Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:
main/waeup.kofa/branches/uli-zc-async
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.kofa/branches/uli-zc-async

  • main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/studylevel.py

    r9209 r9211  
    3737        super(StudentStudyLevel, self).__init__()
    3838        self.level = None
     39        self.validation_date = None
     40        self.validated_by = None
    3941        return
    4042
     
    5456        return studylevelsource.factory.getTitle(self.__parent__, self.level)
    5557
    56     def addCourseTicket(self, ticket, course):
     58    def addCourseTicket(self, courseticket):
    5759        """Add a course ticket object.
    5860        """
    59         if not ICourseTicket.providedBy(ticket):
     61        if not ICourseTicket.providedBy(courseticket):
    6062            raise TypeError(
    6163                'StudentStudyLeves contain only ICourseTicket instances')
    62         ticket.code = course.code
    63         ticket.title = course.title
    64         ticket.fcode = course.__parent__.__parent__.__parent__.code
    65         ticket.dcode = course.__parent__.__parent__.code
    66         ticket.credits = course.credits
    67         ticket.passmark = course.passmark
    68         ticket.semester = course.semester
    69         self[ticket.code] = ticket
     64        self[courseticket.code] = courseticket
    7065        return
    7166
     
    9287
    9388    A course ticket contains a copy of the original course and
    94     certificate course data. If the courses and/or the referrin certificate
    95     courses are removed, the corresponding tickets remain unchanged.
    96     So we do not need any event
     89    course referrer data. If the courses and/or their referrers are removed, the
     90    corresponding tickets remain unchanged. So we do not need any event
    9791    triggered actions on course tickets.
    9892    """
Note: See TracChangeset for help on using the changeset viewer.