Changeset 9925 for main/waeup.kofa/trunk/src

Timestamp:

30 Jan 2013, 09:08:39 (12 years ago)

Author:

Henrik Bettermann

Message:

Convert getLevel and getLevelSession into property attributes.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• browser.py (modified) (1 diff)
• catalog.py (modified) (1 diff)
• export.py (modified) (1 diff)
• interfaces.py (modified) (2 diffs)
• studylevel.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -160 +160 @@
     view.context.writeLogMessage(
         view,'added: %s|%s|%s' % (
-        ticket.code, ticket.getLevel(), ticket.getLevelSession()))
+        ticket.code, ticket.level, ticket.level_session))
     return True
 

main/waeup.kofa/trunk/src/waeup/kofa/students/catalog.py

@@ -131 +131 @@
     grok.context(ICourseTicket)
 
-    level = index.Field(attribute='getLevel')
-    session = index.Field(attribute='getLevelSession')
+    level = index.Field(attribute='level')
+    session = index.Field(attribute='level_session')
     code = index.Field(attribute='code')
 

main/waeup.kofa/trunk/src/waeup/kofa/students/export.py

@@ -265 +265 @@
                 value = getattr(student, name, None)
             if name == 'level':
-                value = getattr(context, 'getLevel', lambda: None)()
+                value = getattr(context, 'level', lambda: None)
             if name == 'level_session':
-                value = getattr(context, 'getLevelSession', lambda: None)()
+                value = getattr(context, 'level_session', lambda: None)
         return super(
             CourseTicketExporter, self).mangle_value(

main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py

@@ -559 +559 @@
     weight = Attribute('weight calculated from score')
     removable_by_student = Attribute('Is student allowed to remove the ticket?')
+    level_session = Attribute('session of the level the ticket has been added to')
+    level = Attribute('id of the level the ticket has been added to')
 
     title = schema.TextLine(
@@ -615 +617 @@
         )
 
-    def getLevel():
-        """Returns the id of the level the ticket has been added to.
-        """
-
-    def getLevelSession():
-        """Returns the session of the level the ticket has been added to.
-        """
 
 class ICourseTicketAdd(IKofaObject):

main/waeup.kofa/trunk/src/waeup/kofa/students/studylevel.py

@@ -203 +203 @@
         return self.__parent__.__parent__.__parent__.writeLogMessage(view, message)
 
-    def getLevel(self):
+    @property
+    def level(self):
         """Returns the id of the level the ticket has been added to.
         """
-        # XXX: shouldn't that be an attribute?
         try:
             return self.__parent__.level
@@ -212 +212 @@
             return None
 
-    def getLevelSession(self):
+    @property
+    def level_session(self):
         """Returns the session of the level the ticket has been added to.
         """
-        # XXX: shouldn't that be an attribute?
         try:
             return self.__parent__.level_session