Changeset 440 for WAeUP_SRP/trunk/skins

Timestamp:

29 Aug 2006, 11:56:53 (18 years ago)

Author:

joachim

Message:

levels can be created
keyerror elective fixed
check for blanks in Id's checked

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_custom/getContentInfo.py (modified) (3 diffs)
• waeup_default/waeup_document_create_do.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_custom/getContentInfo.py

@@ -187 +187 @@
 info['url'] = utool.getUrlFromRpath(info['rpath'])
 
-info['title_or_id'] = proxy.title_or_id()
+info['title_or_id'] = proxy.id
 info['id'] = proxy.getId()
 try:
@@ -193 +193 @@
 except AttributeError:
     raise AttributeError, 'invalid object: %s in %s' % (info['title_or_id'],
-                                                        info['rpath'])
+                                                             info['rpath'])
+except TypeError:
+    info['title'] = proxy.getContent().id
+
 info['icon'] = proxy.getIcon(relative_to_portal=1)
 info['type'] = proxy.getPortalTypeName()
@@ -227 +230 @@
         core = 'core'
         if not doc.core_or_elective:
-            core = elective
+            core = 'elective'
         info['core_or_elective'] = core
     info['time'] = doc.modified()

WAeUP_SRP/trunk/skins/waeup_default/waeup_document_create_do.py

@@ -10 +10 @@
 from Products.CMFCore.utils import getToolByName
 
-id = datamodel.get('code').upper()
-datamodel.set('code',id)
+if type_name == "StudyLevel":
+    id = datamodel.get('code')
+else:
+    id = datamodel.get('code').upper()
+    datamodel.set('code',id)
 ##if not id:
 ##    id = 'my ' + type_name