--- basket/basket.py 2006/04/07 09:44:56 1.10 +++ basket/basket.py 2007/08/14 18:28:17 1.13 @@ -177,9 +177,7 @@ class BasketFolder(BasketBasis): elif mode=='open_intern': print "open_intern" if self.checkPermission('authorized'): - print "---public" for object in self.getObjects(): - print object.getId(),object.publicationStatus if object.publicationStatus=='open_intern' or object.publicationStatus=='open': ret.append(object) return ret @@ -212,8 +210,8 @@ class BasketFolder(BasketBasis): #check if user has right for other modi if hasattr(self,"BasketFolder_template"): - obj=getattr(self,"BaskeFolder_template") - return obj() + obj=getattr(self,"BasketFolder_template") + return obj(mode=mode) else: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketFolder_template_standard.zpt')).__of__(self) pt.content_type="text/html" @@ -288,7 +286,7 @@ class Basket(BasketBasis): """return the save button""" ret=""" save - + onClick="forms.changeSetContents.actualId.value='%s';forms.changeSetContents.submit();">save - """%actualId return ret @@ -554,13 +552,19 @@ class BasketFile(BasketObject,File): def download(self): """download the file""" + self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.title) self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") self.content_type="application/octet-stream" - self.REQUEST.RESPONSE.write(self.data) - - + try: + 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): """update file""" @@ -807,4 +811,4 @@ def manage_addBasketText(self,id,title,c - \ No newline at end of file +