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/university/certificate.txt

    r9209 r9211  
    9696      .. XXX: This is not a proper description
    9797
    98    .. method:: addCertCourse(course[, level=100,[ mandatory=True]])
    99 
    100       Add a certificate course. A course is an object implementing
     98   .. method:: addCourseRef(course[, level=100,[ mandatory=True]])
     99
     100      Add a referrer of a course. A course is an object implementing
    101101      :class:`waeup.kofa.interfaces.ICourse`.
    102102
    103       Please don't be confused by the term 'certificate course'.
    104       As course objects will normaly be  stored
    105       in a department, the certificate course refers to
     103      Please don't be confused by the term 'referrer'. As course objects
     104      will normaly be  stored
     105      in a department, the course referrer refers to
    106106      the 'real' course in the department container.
    107107
    108    .. method:: delCertCourse(code)
    109 
    110       Remove a certificate course from a certificate.
    111 
    112       The certificate course must be given by its code number.
     108   .. method:: delCourseRef(code)
     109
     110      Remove a course referrer from a certificate.
     111
     112      The referrer must be given by its code number.
    113113
    114114:class:`CertificateCourse`
     
    117117.. class:: CertificateCourse(course[, level=100[, mandatory=True]])
    118118
    119    Create a certificate course.
    120 
    121    A certificate course are held in
     119   Create a course referrer.
     120
     121   A certificate course (old term) or course referrer are held in
    122122   certificates and refer to an existing :class:`Course` instance held
    123123   elsewhere.
    124124
    125    A certificate can require several certificate courses and one
    126    certificate course can be required by several certificates.
     125   A certificate can require several course referrers and one
     126   course referrer can be required by several certificates.
    127127
    128128   .. attribute:: course
     
    225225
    226226   To accomplish that, the parents of the removed course are looked up
    227    for a certifcate container which contains a certificate course that
     227   for a certifcate container which contains a course referrer that
    228228   refers to the deleted course.
    229229
     
    341341    >>> mycert.code = 'MYCERT'
    342342    >>> mydept.certificates.addCertificate(mycert)
    343     >>> mycert.addCertCourse(mycourse)
     343    >>> mycert.addCourseRef(mycourse)
    344344
    345345    >>> transaction.commit()
     
    354354    ['mydept']
    355355
    356 The certificate course we stored in the certificate is indeed a
     356The course referrer we stored in the certificate is indeed a
    357357referrer of the course, not a copy of it:
    358358
Note: See TracChangeset for help on using the changeset viewer.