Diff for /OSAS/OSA_system/OSAS_archiver.py between versions 1.6 and 1.7

version 1.6, 2004/01/06 14:39:49 version 1.7, 2004/01/07 10:46:30
Line 416  class OSAS_archiver(Folder, Persistent,I Line 416  class OSAS_archiver(Folder, Persistent,I
   
     def getProducer(self,id):      def getProducer(self,id):
         """Gebe ProducerObjekt zurück"""          """Gebe ProducerObjekt zurück"""
         obj=getattr(self.aq_parent.producerFolder,id)          obj=getattr(self.producerFolder,id)
         return obj          return obj
                   
                   
Line 431  class OSAS_archiver(Folder, Persistent,I Line 431  class OSAS_archiver(Folder, Persistent,I
     def createFolders(self,folderList,producer):      def createFolders(self,folderList,producer):
         """Erzeug die entsprechenden Folder"""          """Erzeug die entsprechenden Folder"""
         #hack          #hack
         producer="library"          #producer="library"
         if type(folderList)==StringType:          if type(folderList)==StringType:
             folders=[folderList]              folders=[folderList]
         else:          else:
             folders=folderList              folders=folderList
                   #return producer
           producerFolderName=self.getProducer(producer).producerFolderName
                   
         for folder in folders:          for folder in folders:
             os.mkdir(self.startPath+"/"+producer+"/"+folder)              os.mkdir(self.startPath+"/"+producerFolderName+"/"+folder)
             os.chmod(self.startPath+"/"+producer+"/"+folder,0775)              os.chmod(self.startPath+"/"+producerFolderName+"/"+folder,0775)
         self.REQUEST.SESSION['folderList']=folders          self.REQUEST.SESSION['folderList']=folders
         pt=PageTemplateFile('Products/OSA_system/createFolders.zpt').__of__(self)          pt=PageTemplateFile('Products/OSA_system/createFolders.zpt').__of__(self)
         return pt()          return pt()
Line 530  class OSAS_producer(SimpleItem,Persisten Line 531  class OSAS_producer(SimpleItem,Persisten
   
     meta_type="OSAS_producer"      meta_type="OSAS_producer"
   
     def __init__(self,shortName,fullName,address="",url="",contact=""):      def __init__(self,shortName,fullName,producerFolderName,address="",url="",contact=""):
   
         self.id=shortName          self.id=shortName
         self.title=fullName          self.title=fullName
         self.address=address          self.address=address
         self.url=url          self.url=url
         self.contact=contact          self.contact=contact
           self.producerFolderName=producerFolderName
   
     manage_options = SimpleItem.manage_options+(      manage_options = SimpleItem.manage_options+(
         {'label':'Main Config','action':'changeOSAS_producerForm'},          {'label':'Main Config','action':'changeOSAS_producerForm'},
Line 547  class OSAS_producer(SimpleItem,Persisten Line 549  class OSAS_producer(SimpleItem,Persisten
         pt=PageTemplateFile('Products/OSA_system/ChangeOSAS_producer.zpt').__of__(self)          pt=PageTemplateFile('Products/OSA_system/ChangeOSAS_producer.zpt').__of__(self)
         return pt()          return pt()
   
     def changeOSAS_producer(self,title,address,contact="",url=""):      def changeOSAS_producer(self,title,address,producerFolderName,contact="",url="",RESPONSE=None):
         """change"""          """change"""
         self.title=fullName          self.title=title
         self.address=address          self.address=address
         self.url=url          self.url=url
         self.contact=contact          self.contact=contact
           self.producerFolderName=producerFolderName
   
           if RESPONSE:
               RESPONSE.redirect("manage_main")
   
 def manage_AddOSAS_producerForm(self):  def manage_AddOSAS_producerForm(self):
     """interface for adding the OSAS_root"""      """interface for adding the OSAS_root"""
Line 560  def manage_AddOSAS_producerForm(self): Line 566  def manage_AddOSAS_producerForm(self):
     return pt()      return pt()
   
   
 def manage_AddOSAS_producer(self,id,title="",contact="",address="",url="",RESPONSE=None):  def manage_AddOSAS_producer(self,id,producerFolderName,title="",contact="",address="",url="",RESPONSE=None):
     """add the OSAS_root"""      """add the OSAS_root"""
     if title=="":      if title=="":
         title=id          title=id
                   
     newObj=OSAS_producer(id, title,address,contact,url)      newObj=OSAS_producer(id, title,producerFolderName,address,contact,url)
     self._setObject(id,newObj)      self._setObject(id,newObj)
     if RESPONSE is not None:      if RESPONSE is not None:
         RESPONSE.redirect('manage_main')          RESPONSE.redirect('manage_main')

Removed from v.1.6  
changed lines
  Added in v.1.7


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>