Changeset 10650

Timestamp:

25 Sep 2013, 06:46:53 (11 years ago)

Author:

Henrik Bettermann

Message:

Convert longtitle() into property attribute.

Location:

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

Files:

• applicants/pdf.py (modified) (1 diff)
• browser/breadcrumbs.py (modified) (2 diffs)
• browser/pages.py (modified) (2 diffs)
• browser/templates/certificatecoursepage.pt (modified) (1 diff)
• students/browser.py (modified) (3 diffs)
• students/export.py (modified) (1 diff)
• students/reports/level_report.py (modified) (2 diffs)
• students/reports/session_results_presentation.py (modified) (1 diff)
• students/utils.py (modified) (6 diffs)
• university/certificate.py (modified) (2 diffs)
• university/course.py (modified) (1 diff)
• university/department.py (modified) (1 diff)
• university/faculty.py (modified) (1 diff)
• university/interfaces.py (modified) (5 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/pdf.py

@@ -93 +93 @@
                 '__parent__', None)
         faculty = getattr(dept, '__parent__', None)
-        return [x is not None and x.longtitle() or x for x in dept, faculty]
+        return [x is not None and x.longtitle or x for x in dept, faculty]
 
     def _addLoginInformation(self):

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

@@ -182 +182 @@
     @property
     def title(self):
-        return self.context.longtitle()
+        return self.context.longtitle
 
 class DepartmentBreadcrumb(FacultyBreadcrumb):
@@ -217 +217 @@
     @property
     def title(self):
-        return self.context.longtitle()
+        return self.context.longtitle
 
 def getBreadcrumb(obj, viewname=None):

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

@@ -1865 +1865 @@
     @property
     def label(self):
-        return _('Find students in ') + ('%s' % self.context.longtitle())
+        return _('Find students in ') + ('%s' % self.context.longtitle)
 
     def _find_students(self,query=None, searchtype=None, view=None):
@@ -2330 +2330 @@
     @property
     def label(self):
-        return '%s' % (self.context.longtitle())
+        return '%s' % (self.context.longtitle)
 
     @property

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatecoursepage.pt

@@ -18 +18 @@
       <td i18n:translate="">Provided by:</td>
       <td>
-      <span tal:content="python: context.course.__parent__.__parent__.longtitle()">DEPARTMENT</span>
+      <span tal:content="python: context.course.__parent__.__parent__.longtitle">DEPARTMENT</span>
       <br />
-      <span tal:content="python: context.course.__parent__.__parent__.__parent__.longtitle()">FACULTY</span>
+      <span tal:content="python: context.course.__parent__.__parent__.__parent__.longtitle">FACULTY</span>
       </td>
     </tr>

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

@@ -2930 +2930 @@
 
     def label(self):
-        return 'Students in %s' % self.context.longtitle()
+        return 'Students in %s' % self.context.longtitle
 
     def _set_session_values(self):
@@ -2996 +2996 @@
 
     def label(self):
-        return 'Students studying %s' % self.context.longtitle()
+        return 'Students studying %s' % self.context.longtitle
 
     def _searchCatalog(self, session, level):
@@ -3024 +3024 @@
 
     def label(self):
-        return 'Students registered for %s' % self.context.longtitle()
+        return 'Students registered for %s' % self.context.longtitle
 
     def _searchCatalog(self, session, level):

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

@@ -476 +476 @@
             value = certificate.title
         if name == 'department' and certificate is not None:
-            value = certificate.__parent__.__parent__.longtitle()
+            value = certificate.__parent__.__parent__.longtitle
         if name == 'faculty' and certificate is not None:
-            value = certificate.__parent__.__parent__.__parent__.longtitle()
+            value = certificate.__parent__.__parent__.__parent__.longtitle
         if name == 'passport_path' and certificate is not None:
             file_id = IFileStoreNameChooser(context).chooseName(attr='passport.jpg')

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/level_report.py

@@ -152 +152 @@
         self.faccode = faccode
         self.depcode = depcode
-        self.factitle = site['faculties'][faccode].longtitle()
-        self.deptitle = site['faculties'][faccode][depcode].longtitle()
+        self.factitle = site['faculties'][faccode].longtitle
+        self.deptitle = site['faculties'][faccode][depcode].longtitle
         self.author = author
         self.creation_dt_string = self.creation_dt.astimezone(
@@ -272 +272 @@
             for dep in fac.values():
                 faccode_depcodes.append(
-                    ('%s (%s)' %(dep.longtitle(), fac.longtitle()),
+                    ('%s (%s)' %(dep.longtitle, fac.longtitle),
                      '%s_%s' %(fac.code, dep.code)))
         self.faccode_depcodes = sorted(

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/session_results_presentation.py

@@ -130 +130 @@
         self.faccode = faccode
         self.depcode = depcode
-        self.factitle = site['faculties'][faccode].longtitle()
-        self.deptitle = site['faculties'][faccode][depcode].longtitle()
+        self.factitle = site['faculties'][faccode].longtitle
+        self.deptitle = site['faculties'][faccode][depcode].longtitle
         self.author = author
         self.creation_dt_string = self.creation_dt.astimezone(

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

@@ -142 +142 @@
             f_label = Paragraph(f_label, ENTRY1_STYLE)
             f_text = formatted_text(
-                studentview.context['studycourse'].certificate.longtitle())
+                studentview.context['studycourse'].certificate.longtitle)
             f_text = Paragraph(f_text, ENTRY1_STYLE)
             data_right.append([f_label,f_text])
@@ -150 +150 @@
             f_text = formatted_text(
                 studentview.context[
-                'studycourse'].certificate.__parent__.__parent__.longtitle(),
+                'studycourse'].certificate.__parent__.__parent__.longtitle,
                 )
             f_text = Paragraph(f_text, ENTRY1_STYLE)
@@ -159 +159 @@
             f_text = formatted_text(
                 studentview.context[
-                'studycourse'].certificate.__parent__.__parent__.__parent__.longtitle(),
+                'studycourse'].certificate.__parent__.__parent__.__parent__.longtitle,
                 )
             f_text = Paragraph(f_text, ENTRY1_STYLE)
@@ -727 +727 @@
         f_label = trans(_('Course of Study:'), portal_language)
         f_label = Paragraph(f_label, ENTRY1_STYLE)
-        f_text = formatted_text(view.context.certificate.longtitle())
+        f_text = formatted_text(view.context.certificate.longtitle)
         f_text = Paragraph(f_text, ENTRY1_STYLE)
         contextdata.append([f_label,f_text])
@@ -734 +734 @@
         f_label = Paragraph(f_label, ENTRY1_STYLE)
         f_text = formatted_text(
-            view.context.certificate.__parent__.__parent__.__parent__.longtitle())
+            view.context.certificate.__parent__.__parent__.__parent__.longtitle)
         f_text = Paragraph(f_text, ENTRY1_STYLE)
         contextdata.append([f_label,f_text])
@@ -741 +741 @@
         f_label = Paragraph(f_label, ENTRY1_STYLE)
         f_text = formatted_text(
-            view.context.certificate.__parent__.__parent__.longtitle())
+            view.context.certificate.__parent__.__parent__.longtitle)
         f_text = Paragraph(f_text, ENTRY1_STYLE)
         contextdata.append([f_label,f_text])

main/waeup.kofa/trunk/src/waeup/kofa/university/certificate.py

@@ -89 +89 @@
         return None
 
+    @property
     def longtitle(self):
         return "%s (%s)" % (self.title,self.code)
@@ -161 +162 @@
         return self.course.code
 
+    @property
     def longtitle(self):
         return "%s in level %s" % (self.course.code,

main/waeup.kofa/trunk/src/waeup/kofa/university/course.py

@@ -67 +67 @@
         return None
 
+    @property
     def longtitle(self):
         return "%s (%s)" % (self.title,self.code)

main/waeup.kofa/trunk/src/waeup/kofa/university/department.py

@@ -89 +89 @@
         return None
 
+    @property
     def longtitle(self):
         return longtitle(self)

main/waeup.kofa/trunk/src/waeup/kofa/university/faculty.py

@@ -74 +74 @@
         self[department.code] = department
 
+    @property
     def longtitle(self):
         return longtitle(self)

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

@@ -55 +55 @@
         )
 
-    def longtitle():
-        """
-        Returns the long title of a faculty.
-        """
 
 class IFacultyAdd(IFaculty):
@@ -114 +110 @@
     certificates = Attribute("A container for certificates.")
 
-    def longtitle():
-        """
-        Returns the long title of a department.
-        """
 
 class IDepartmentAdd(IDepartment):
@@ -185 +177 @@
         )
 
-    def longtitle():
-        """
-        Returns the long title of a course.
-        """
 
 class ICourseAdd(ICourse):
@@ -293 +281 @@
         required = False,
         )
-
-    def longtitle():
-        """
-        Returns the long title of a certificate.
-        """
 
     @invariant
@@ -364 +347 @@
         """
 
-    def longtitle():
-        """
-        Returns the long title of a certificatecourse.
-        """
-
-
 class ICertificateCourseAdd(ICertificateCourse):
     """A certificatecourse is referring a course and