[BACK]Return to basket.py CVS log [TXT] [DIR] Up to [Repository] / basket

Diff for /basket/basket.py between versions 1.13 and 1.14

version 1.13, 2007/08/14 18:28:17 version 1.14, 2007/08/15 15:49:03
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 304  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 340  class Basket(BasketBasis): Line 346  class Basket(BasketBasis):
         self.shortDescription=shortDescription          self.shortDescription=shortDescription
                   
                   
       def getComment(self):
           """get the comment"""
           return unicodify(self.title)
           
   
       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 505  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 737  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 801  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.13  
changed lines
  Added in v.1.14

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