Changeset 2653

Timestamp:

14 Nov 2007, 17:49:39 (17 years ago)

Author:

Henrik Bettermann

Message:

rename sessions_voc.py

Location:

WAeUP_SRP

Files:

• base/skins/waeup_default/getNextSessionId.py_deprecated (deleted)
• base/skins/waeup_default/getSessionId.py (modified) (1 diff)
• base/skins/waeup_default/getSessionsVoc.py (added)
• base/skins/waeup_default/sessions_voc.py (deleted)
• base/skins/waeup_epayment/getSchoolFee.py (modified) (2 diffs)
• base/skins/waeup_student/get_levels_voc.py_deprecated (deleted)
• fceokene/profiles/default/vocabularies/sessions.xml (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_default/getSessionId.py

@@ -10 +10 @@
 # $Id$
 """
-return the Session Id
+return the Portal Session Id
 """
-
-# must be changed in 2007/2008; should return only the last two digits
-
-#import DateTime
-#now = DateTime.DateTime()
-#if now.month() > 11:
-#    s = "%s" % now.year()
-#else:
-#    s = "%s" % (now.year() - 1)
-#return s
 
 session_id = context.portal_properties.session[2:4]

WAeUP_SRP/base/skins/waeup_epayment/getSchoolFee.py

@@ -105 +105 @@
          }
 
-#sessionstring = "School Fee for Session %s" % context.portal_vocabularies.sessions.get(session)
-# sessionstring = "School Fee for Session %s" % context.sessions_voc(key=session)
-# fee_1_data = ("22200",sessionstring)
-# fee_2_data = ("23700",sessionstring)
-
-# if faculty in fee1:
-#     return fee_1_data
-# return fee_2_data
 d = {}
 if brain.mode.endswith('_ft'):
@@ -120 +112 @@
     d['new'] = session_fees[brain.session][f]
     d['returning'] = 'not set'
-    d['description'] = "School Fee for Session %s" % context.sessions_voc(key=brain.session)
+    d['description'] = "School Fee for Session %s" % context.getSessionsVoc(key=brain.session)
 if pt_fees.has_key(brain.course):
     d = pt_fees[brain.course]
-    d['description'] = "School Fee for Session %s, %s" % (context.sessions_voc(key=brain.session),
+    d['description'] = "School Fee for Session %s, %s" % (context.getSessionsVoc(key=brain.session),
                                                          d['description'])
 return d

WAeUP_SRP/fceokene/profiles/default/vocabularies/sessions.xml

@@ -5 +5 @@
  <property name="title_msgid"></property>
  <property name="description"></property>
- <property name="get_vocabulary_method">sessions_voc</property>
+ <property name="get_vocabulary_method">getSessionsVoc</property>
  <property name="add_empty_key">False</property>
  <property name="empty_key_pos">first</property>