Changeset 159


Ignore:
Timestamp:
05/08/09 11:58:34 (6 years ago)
Author:
jon
Message:

Reverting changes made for the integration of refactored IMSTransport tool. Changes our now located in trunk.

Location:
enpraxis.educommons/trunk/enpraxis/educommons
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • enpraxis.educommons/trunk/enpraxis/educommons/browser/configure.zcml

    r137 r159  
    88  <include package="plone.app.contentmenu" /> 
    99 
    10   <utility 
    11     provides="collective.imstransport.utilities.interfaces.IIMSManifestWriter" 
    12     factory="enpraxis.educommons.utilities.ccwriter.IMSCCWriter" 
    13     name="eduCommons Common Cartridge" 
    14     /> 
    15  
    1610  <browser:page 
    1711     name="order_courseobjs" 
  • enpraxis.educommons/trunk/enpraxis/educommons/configure.zcml

    r137 r159  
    156156  /> 
    157157 
     158  <subscriber  
     159     for="collective.imstransport.interfaces.ISetNameSpaces"  
     160     handler=".eventHandlers.setNameSpaces" />  
     161                  
     162  <subscriber  
     163     for="collective.imstransport.interfaces.IObjectWriteMetadata"  
     164     handler=".eventHandlers.writeECMetadata" />  
     165 
     166  <subscriber 
     167     for="collective.imstransport.interfaces.IObjectReadMetadata"  
     168     handler=".eventHandlers.readECMetadata" />  
     169                  
     170  <subscriber 
     171     for="collective.imstransport.interfaces.IObjectWriteOrganizations"  
     172     handler=".eventHandlers.writeOrganizations" />  
     173                  
     174  <subscriber 
     175     for="collective.imstransport.interfaces.IObjectReadOrganizations"  
     176     handler=".eventHandlers.readOrganizations" />  
     177                  
     178  <subscriber  
     179     for="collective.imstransport.interfaces.IObjectWriteContributeNode"  
     180     handler=".eventHandlers.writeContributeNode" />  
     181                   
     182  <subscriber  
     183     for="collective.imstransport.interfaces.IObjectReadContributeNode"  
     184     handler=".eventHandlers.readContributeNode" />  
     185                   
     186  <subscriber  
     187     for="collective.imstransport.interfaces.IObjectCreateObject" 
     188     handler=".eventHandlers.eduCommonsCreateObject" /> 
    158189 
    159190  <subscriber 
  • enpraxis.educommons/trunk/enpraxis/educommons/eventHandlers.py

    r137 r159  
    2727 
    2828from enpraxis.educommons.interfaces import ICourse, IDivision 
    29 from collective.imstransport.utilities.ccwriter import LOM_namespace 
     29from collective.imstransport.ManifestHandlers import LOM_namespace  
     30from collective.imstransport.IMS_exceptions import ManifestError  
    3031from Products.CMFDefault.SyndicationTool import SyndicationTool 
    3132from Products.CMFDefault.SyndicationInfo import SyndicationInformation 
     
    3738from zope.schema.interfaces import IVocabularyFactory 
    3839from zope.formlib.form import action 
    39 from collective.imstransport.browser.importform import IMSImportForm 
     40from collective.imstransport.browser.imstransportform import ImportForm  
    4041from utilities.interfaces import IECUtility 
    4142from zope.component import getUtility, queryUtility 
     
    568569     
    569570 
    570 class eduCommonsImportForm(IMSImportForm): 
     571class eduCommonsImportForm(ImportForm): 
    571572    """ Render the import form  """ 
    572573 
  • enpraxis.educommons/trunk/enpraxis/educommons/overrides.zcml

    r137 r159  
    130130 
    131131 
    132   <utility 
    133     provides="collective.imstransport.utilities.interfaces.IIMSManifestWriter" 
    134     factory="enpraxis.educommons.utilities.ccwriter.IMSCCWriter" 
    135     name="Common Cartridge" 
    136     /> 
    137  
    138  
    139132        
    140133</configure> 
  • enpraxis.educommons/trunk/enpraxis/educommons/portlet/coursebuilderform.py

    r137 r159  
    3636from enpraxis.educommons import eduCommonsMessageFactory as _ 
    3737from Products.CMFCore.utils import getToolByName 
    38 from collective.imstransport.browser.importform import ZipFileLine 
     38from collective.imstransport.browser.imstransportform import ZipFileLine 
    3939from collective.imstransport.utilities.interfaces import IIMSTransportUtility 
    4040from Products.CMFDefault.formlib.widgets import ChoiceRadioWidget 
     
    164164    packagetype = schema.Choice(title=_(u"Package Type"), 
    165165                                description=_(u"The type of the ims package being uploaded"), 
    166                                 required=False, 
     166                                required=True, 
    167167                                default='Default', 
    168                                 vocabulary="imspackagetypevocab") 
     168                                vocabulary="imsvocab") 
    169169 
    170170 
     
    263263             
    264264        if filename != '' and packagetype != '': 
    265             imsvocab = getUtility(IVocabularyFactory, name='imspackagetypevocab')(self.context) 
     265            imsvocab = getUtility(IVocabularyFactory, name='imsvocab')(self.context) 
    266266            package_xform = imsvocab.getTermByToken(packagetype).value 
    267267            self.ims_util.importZipfile(course,filename,package_xform,rtype='eduCommons')             
Note: See TracChangeset for help on using the changeset viewer.