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

version 1.9, 2006/04/07 09:35:38 version 1.13, 2007/08/14 18:28:17
Line 177  class BasketFolder(BasketBasis): Line 177  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 210  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 286  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 554  class BasketFile(BasketObject,File): Line 552  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 587  class BasketFile(BasketObject,File): Line 591  class BasketFile(BasketObject,File):
         """format object as html fragment"""          """format object as html fragment"""
                   
                   
         return BasketBasis.content_html(self,"BasketFile")          return BasketObject.content_html(self,"BasketFile")
           
 def manage_addBasketFile(self,id,title,comment,fileUpload,content_type='',precondition='',REQUEST=None):  def manage_addBasketFile(self,id,title,comment,fileUpload,content_type='',precondition='',REQUEST=None):
     """add a basket file"""      """add a basket file"""
Line 648  class BasketXRef(BasketObject): Line 652  class BasketXRef(BasketObject):
         """format object as html fragment"""          """format object as html fragment"""
                   
         type=self.xref[0:3]          type=self.xref[0:3]
         return BasketBasis.content_html(self,"BasketXRef_%s"%type)          return BasketObject.content_html(self,"BasketXRef_%s"%type)
           
 def manage_addBasketXRefForm(self):  def manage_addBasketXRefForm(self):
     """form for adding a basket"""      """form for adding a basket"""
Line 673  class BasketInternalLink(BasketObject): Line 677  class BasketInternalLink(BasketObject):
     #security=ClassSecurityInfo()      #security=ClassSecurityInfo()
     meta_type="BasketInternalLink"      meta_type="BasketInternalLink"
           
     manage_options=BasketBasis.manage_options+(      manage_options=BasketObject.manage_options+(
         {'label':'manage internal link','action':'changeBasketInternalLinkForm'},          {'label':'manage internal link','action':'changeBasketInternalLinkForm'},
         )          )
     
Line 698  class BasketInternalLink(BasketObject): Line 702  class BasketInternalLink(BasketObject):
     def content_html(self):      def content_html(self):
         """format object as html fragment"""          """format object as html fragment"""
                   
         return BasketBasis.content_html(self,"BasketInternalLink")          return BasketObject.content_html(self,"BasketInternalLink")
           
     def linkToObject(self):      def linkToObject(self):
         """link to the object (internalLink)"""          """link to the object (internalLink)"""
Line 729  class BasketExternalLink(BasketObject): Line 733  class BasketExternalLink(BasketObject):
     #security=ClassSecurityInfo()      #security=ClassSecurityInfo()
     meta_type="BasketExternalLink"      meta_type="BasketExternalLink"
           
     manage_options=BasketBasis.manage_options+(      manage_options=BasketObject.manage_options+(
         {'label':'manage internal link','action':'changeBasketExternalLinkForm'},          {'label':'manage internal link','action':'changeBasketExternalLinkForm'},
         )          )
     
Line 754  class BasketExternalLink(BasketObject): Line 758  class BasketExternalLink(BasketObject):
     def content_html(self):      def content_html(self):
         """format object as html fragment"""          """format object as html fragment"""
                   
         return BasketBasis.content_html(self,"BasketExternalLink")          return BasketObject.content_html(self,"BasketExternalLink")
           
     def linkToObject(self):      def linkToObject(self):
         """link to the object (externalLink)"""          """link to the object (externalLink)"""

Removed from v.1.9  
changed lines
  Added in v.1.13


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