Changeset 9209 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/university/certificate.py

Timestamp:

20 Sep 2012, 08:49:37 (12 years ago)

Author:

uli

Message:

Merge changes from update branch (includes trunk changes until r9107).

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/university/certificate.py (modified) (3 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/university/certificate.py

@@ -36 +36 @@
     grok.implements(ICertificate, ICertificateAdd)
 
-    @property       # Make this method read_only and looking like an attr.
-    def local_roles(self):
-        return ['waeup.local.CourseAdviser100',
-                'waeup.local.CourseAdviser200',
-                'waeup.local.CourseAdviser300',
-                'waeup.local.CourseAdviser400',
-                'waeup.local.CourseAdviser500',
-                'waeup.local.CourseAdviser600',
-                ]
+    local_roles = [
+        'waeup.local.CourseAdviser100',
+        'waeup.local.CourseAdviser200',
+        'waeup.local.CourseAdviser300',
+        'waeup.local.CourseAdviser400',
+        'waeup.local.CourseAdviser500',
+        'waeup.local.CourseAdviser600',
+        ]
 
     def __init__(self, code=u'NA', title=u'Unnamed Certificate',
                  study_mode=None, start_level=None,
                  end_level=None, application_category=None,
-                 school_fee_1=None, school_fee_2=None):
+                 school_fee_1=None, school_fee_2=None,
+                 school_fee_3=None, school_fee_4=None):
         super(Certificate, self).__init__()
         self.code = code
@@ -59 +59 @@
         self.school_fee_1 = school_fee_1
         self.school_fee_2 = school_fee_2
+        self.school_fee_3 = school_fee_3
+        self.school_fee_4 = school_fee_4
 
     def longtitle(self):
         return "%s (%s)" % (self.title,self.code)
 
-    def addCourseRef(self, course, level=100, mandatory=True):
-        """Add a course referrer.
+    def addCertCourse(self, course, level=100, mandatory=True):
+        """Add a certificate course.
         """
         code = "%s_%s" % (course.code, level)
@@ -72 +74 @@
         self._p_changed = True
 
-    def delCourseRef(self, code, level=None):
-        """Delete a course referrer denoted by its code.
+    def delCertCourse(self, code, level=None):
+        """Delete a certificate course denoted by its code.
         """
         keys = list(self.keys()) # create list copy