Diff for /basket/basket.py between versions 1.10 and 1.15

version 1.10, 2006/04/07 09:44:56 version 1.15, 2009/04/21 07:57:00
Line 22  from Globals import Persistent, package_ Line 22  from Globals import Persistent, package_
 from Acquisition import Implicit  from Acquisition import Implicit
 from Products.ZCatalog.CatalogPathAwareness import CatalogAware  from Products.ZCatalog.CatalogPathAwareness import CatalogAware
   
   
 from groups import manage_addGroupFolder  from groups import manage_addGroupFolder
   
   from Products.ECHO_content.ECHO_helpers import unicodify
   
 refBasis="http://vlp.mpiwg-berlin.mpg.de/references?id=%s  refBasis="http://vlp.mpiwg-berlin.mpg.de/references?id=%s
   
 basketMetatypes=['BasketXRef','BasketInternalLink','BasketExternalLink','BasketText','BasketFile']  basketMetatypes=['BasketXRef','BasketInternalLink','BasketExternalLink','BasketText','BasketFile']
Line 141  class BasketBasis(OrderedFolder): Line 142  class BasketBasis(OrderedFolder):
                       
     def getOwner(self):      def getOwner(self):
         """get Owner as string"""          """get Owner as string"""
         return self.owner          return unicodify(self.owner)
       
   
       def getTitle(self):
           """get title"""
           return unicodify(self.title)
           
     def getActualUserName(self):      def getActualUserName(self):
         """get username of actual user"""          """get username of actual user"""
Line 151  class BasketBasis(OrderedFolder): Line 154  class BasketBasis(OrderedFolder):
                   
     def getObjects(self):      def getObjects(self):
         """"get objects"""          """"get objects"""
         return [getattr(self,x['id']) for x in self._objects]          return self.objectValues()
           #return [getattr(self,x['id']) for x in self._objects]
         
     def numberOfObjects(self):      def numberOfObjects(self):
         """anzahl der elemente im basket"""          """anzahl der elemente im basket"""
         return len(self._objects)          return len(self._objects)
           
       
 class BasketFolder(BasketBasis):  class BasketFolder(BasketBasis):
     """Folder for Baskets"""      """Folder for Baskets"""
           
Line 177  class BasketFolder(BasketBasis): Line 182  class BasketFolder(BasketBasis):
         elif mode=='open_intern':          elif mode=='open_intern':
             print "open_intern"              print "open_intern"
             if self.checkPermission('authorized'):              if self.checkPermission('authorized'):
                 print "---public"  
                 for object in self.getObjects():                  for object in self.getObjects():
                     print object.getId(),object.publicationStatus  
                     if object.publicationStatus=='open_intern' or object.publicationStatus=='open':                      if object.publicationStatus=='open_intern' or object.publicationStatus=='open':
                         ret.append(object)                          ret.append(object)
                 return ret                  return ret
Line 212  class BasketFolder(BasketBasis): Line 215  class BasketFolder(BasketBasis):
         #check if user has right for other modi          #check if user has right for other modi
                   
         if hasattr(self,"BasketFolder_template"):          if hasattr(self,"BasketFolder_template"):
             obj=getattr(self,"BaskeFolder_template")              obj=getattr(self,"BasketFolder_template")
             return obj()              return obj(mode=mode)
         else:          else:
             pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketFolder_template_standard.zpt')).__of__(self)              pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketFolder_template_standard.zpt')).__of__(self)
             pt.content_type="text/html"              pt.content_type="text/html"
Line 288  class Basket(BasketBasis): Line 291  class Basket(BasketBasis):
         """return the save button"""          """return the save button"""
         ret="""          ret="""
         <a class="editLink" style="cursor:pointer"          <a class="editLink" style="cursor:pointer"
                     'onClick="forms.changeSetContents.actualId.value='%s';forms.changeSetContents.submit();">save</a> -                      onClick="forms.changeSetContents.actualId.value='%s';forms.changeSetContents.submit();">save</a> -
           
         """%actualId          """%actualId
         return ret          return ret
Line 306  class Basket(BasketBasis): Line 309  class Basket(BasketBasis):
     
     def getBasketObjects(self):      def getBasketObjects(self):
         """get all basket objects"""          """get all basket objects"""
   #         objs=self.getObjects()
   #         ret=[]
   #         for x in objs:
   #             if x.meta_type in basketMetatypes:
   #                ret.append(x)
   #         return ret
           return self.objectValues(basketMetatypes)
                   
         objs=self.getObjects()  
         ret=[]  
         for x in objs:  
             if x.meta_type in basketMetatypes:  
                ret.append(x)  
         return ret  
           
     def checkRef(self,xref):      def checkRef(self,xref):
         """check if XRef is already in Basket"""          """check if XRef is already in Basket"""
Line 342  class Basket(BasketBasis): Line 346  class Basket(BasketBasis):
         self.shortDescription=shortDescription          self.shortDescription=shortDescription
                   
                   
       def getComment(self):
           """get the comment"""
           return unicodify(self.comment)
           
   
       def getShortDescription(self):
           """get the short description"""
           return unicodify(self.shortDescription)
     
     def getTitle(self):  
         """print name"""  
         return self.title  
                   
     security.declareProtected('Manage','changeBasketForm')      security.declareProtected('Manage','changeBasketForm')
     def changeBasketForm(self):      def changeBasketForm(self):
Line 507  class BasketObject(SimpleItem): Line 516  class BasketObject(SimpleItem):
         self.title=title          self.title=title
         self.comment=comment          self.comment=comment
                   
       def getTitle(self):
           """get the title"""
           return unicodify(self.title)
   
       def getComment(self):
           """get the comment"""
           return unicodify(self.comment)
   
           
     def changeBasketBasisForm(self):      def changeBasketBasisForm(self):
         """form for changing the basket"""          """form for changing the basket"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeBasketBasis.zpt')).__of__(self)          pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeBasketBasis.zpt')).__of__(self)
Line 554  class BasketFile(BasketObject,File): Line 572  class BasketFile(BasketObject,File):
           
     def download(self):      def download(self):
         """download the file"""          """download the file"""
   
         self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.title)          self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.title)
         self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")          self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
         
         self.content_type="application/octet-stream"          self.content_type="application/octet-stream"
       try:
         self.REQUEST.RESPONSE.write(self.data)          self.REQUEST.RESPONSE.write(self.data)
                   except:
           try:
               self.REQUEST.RESPONSE.write(str(self.data))
           except:
               self.REQUEST.RESPONSE.write(repr(self.data))
           
     def upDateFile(self,fileUpload=None,comment=None,title="",REQUEST=None):      def upDateFile(self,fileUpload=None,comment=None,title="",REQUEST=None):
         """update file"""          """update file"""
Line 733  class BasketExternalLink(BasketObject): Line 757  class BasketExternalLink(BasketObject):
         {'label':'manage internal link','action':'changeBasketExternalLinkForm'},          {'label':'manage internal link','action':'changeBasketExternalLinkForm'},
         )          )
     
       def getLinkText(self):
           """get the link text"""
           return unicodify(self.linkText)
    
     def changeBasketExternalLinkForm(self):      def changeBasketExternalLinkForm(self):
         """form for changing the basket"""          """form for changing the basket"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeBasketExternalLink.zpt')).__of__(self)          pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeBasketExternalLink.zpt')).__of__(self)
Line 797  def manage_addBasketTextForm(self): Line 825  def manage_addBasketTextForm(self):
 def manage_addBasketText(self,id,title,comment,RESPONSE=None):  def manage_addBasketText(self,id,title,comment,RESPONSE=None):
     """add a basketXRef object"""      """add a basketXRef object"""
           
       
     newObj=BasketText(id,title,comment)      newObj=BasketText(id,title,comment)
           
     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.10  
changed lines
  Added in v.1.15


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