Changeset 632 for enpraxis.educommons/trunk/enpraxis/educommons/portlet/coursebuilderform.py

Timestamp:

12/23/09 06:06:58 (2 years ago)

Author:

dray

Message:

freeversity changes, initial work toward deprecating OpenOCW

Files:

• enpraxis.educommons/trunk/enpraxis/educommons/portlet/coursebuilderform.py (modified) (7 diffs)

enpraxis.educommons/trunk/enpraxis/educommons/portlet/coursebuilderform.py

@@ -25 +25 @@
 from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
 from plone.app.form.base import AddForm
-from plone.app.form.validators import null_validator
 from plone.app.controlpanel.widgets import MultiCheckBoxVocabularyWidget
-from zope.formlib.form import FormFields, action, applyChanges
+from zope.formlib.form import FormFields, action
 from zope.app.form.browser import DropdownWidget, FileWidget, RadioWidget
 from zope.app.form.browser.widget import renderElement
 from zope.app.form.interfaces import WidgetInputError
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from Products.CMFPlone import PloneMessageFactory
 from enpraxis.educommons import eduCommonsMessageFactory as _
-from zope.app.i18n import ZopeMessageFactory as __
 from Products.CMFCore.utils import getToolByName
 from collective.imstransport.browser.importform import ZipFileLine
@@ -51 +48 @@
     return widget
 
+#def schoolsvocab(context):
+#    """ Get the list of current divisions and return it as a vocabulary. """
+#    path = {'query':('/'), }
+#    brains = context.portal_catalog.searchResults(path=path, Type='School', sort_on='sortable_title')
+#    terms = [SimpleTerm(x.getId, title=x.Title.decode('utf-8') ) for x in brains]
+
+#    return SimpleVocabulary(terms)
+
 def divisionsvocab(context):
     """ Get the list of current divisions and return it as a vocabulary. """
     path = {'query':('/'), }
     brains = context.portal_catalog.searchResults(path=path, Type='Division', sort_on='sortable_title')
-    terms = [SimpleTerm(x.getId, title=x.Title.decode('utf-8') ) for x in brains]
+    terms = []
+    for brain in brains:
+        if brain.getObject().aq_parent.portal_type == 'School':
+            title = '%s : %s' % (brain.getObject().aq_parent.Title().decode('utf-8'), brain.Title.decode('utf-8'))
+        else:
+            title = brain.Title.decode('utf-8')            
+        terms += [SimpleTerm(brain.getId, title=title),]
+    #terms = [SimpleTerm(x.getId, title=x.Title.decode('utf-8') ) for x in brains]
+
     return SimpleVocabulary(terms)
 
@@ -122 +135 @@
         value = ''
         contents = []
-        have_results = False
 
         # Render the Drop Down
@@ -133 +145 @@
         contents.append(self._div('value', renderElement('input',
                                                          type='text',
-                                                         name='form.newdivision',
-                                                         id='form.division.textfield')))
+                                                         name='.new'.join(self.name.split(',')),
+                                                         id='%s.textfield' % self.name)))
                                                       
         contents.append(self._emptyMarker())
@@ -148 +160 @@
                       vocabulary='eduCommons.divisionsvocab')
 
-    coursename = TextLine(title=PloneMessageFactory(u'Title') )
+#    school = Choice(title=_(u'School'),
+#                    required=False,
+#                    vocabulary='eduCommons.schoolsvocab')
+
+
+    coursename = TextLine(title=PloneMessageFactory(u'Course Title') )
     
     courseid = TextLine(title=_(u'Course ID'),
@@ -181 +198 @@
     form_fields = FormFields(ICourseBuilderForm)
     form_fields['division'].custom_widget = EitherOrWidget
+#    form_fields['school'].custom_widget = EitherOrWidget        
     form_fields['templates'].custom_widget = MultiPreSelectCheckBoxVocabularyWidget
     form_fields['filename'].custom_widget = FileWidget
@@ -220 +238 @@
         divname = self.request.form['form.division']
         newdivision = self.request.form['form.newdivision']
+
         if newdivision:
             portal = self.context.portal_url