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

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:

• . (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)
 
-    local_roles = [
-        'waeup.local.CourseAdviser100',
-        'waeup.local.CourseAdviser200',
-        'waeup.local.CourseAdviser300',
-        'waeup.local.CourseAdviser400',
-        'waeup.local.CourseAdviser500',
-        'waeup.local.CourseAdviser600',
-        ]
+    @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',
+                ]
 
     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_3=None, school_fee_4=None):
+                 school_fee_1=None, school_fee_2=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 addCertCourse(self, course, level=100, mandatory=True):
-        """Add a certificate course.
+    def addCourseRef(self, course, level=100, mandatory=True):
+        """Add a course referrer.
         """
         code = "%s_%s" % (course.code, level)
@@ -74 +72 @@
         self._p_changed = True
 
-    def delCertCourse(self, code, level=None):
-        """Delete a certificate course denoted by its code.
+    def delCourseRef(self, code, level=None):
+        """Delete a course referrer denoted by its code.
         """
         keys = list(self.keys()) # create list copy