--- basket/basket.py 2006/03/02 19:57:32 1.2 +++ basket/basket.py 2006/04/06 16:49:14 1.8 @@ -8,6 +8,7 @@ import cgi from OFS.OrderedFolder import OrderedFolder from OFS.SimpleItem import SimpleItem +from OFS.Image import File from AccessControl import ClassSecurityInfo from AccessControl.User import UserFolder @@ -21,7 +22,13 @@ from Globals import Persistent, package_ from Acquisition import Implicit from Products.ZCatalog.CatalogPathAwareness import CatalogAware + +from groups import manage_addGroupFolder + refBasis="http://vlp.mpiwg-berlin.mpg.de/references?id=%s" + +basketMetatypes=['BasketXRef','BasketInternalLink','BasketExternalLink','BasketText','BasketFile'] + #basis url for references publicationStatusList=['private','hidden','open_intern','open','group'] @@ -31,6 +38,26 @@ class BasketBasis(OrderedFolder): """Basis class for BasketFolder and Baskets""" security=ClassSecurityInfo() + + def checkPermission(self,modus): + """check permission""" + if modus=='open': + return True + elif modus=='private': + return self.groupFolder.isMemberOf('admin') + elif modus=='admin': + return self.groupFolder.isMemberOf('admin') + elif modus=='edit': + return (self.groupFolder.isMemberOf('editor') or self.groupFolder.isMemberOf('admin')) + elif modus=='publish': + return self.groupFolder.isMemberOf('publish') + elif modus=='authorized': + if self.getActualUserName().lower() == "anonymous user": + return False + else: + return True + + def getNewId(self): """createIds""" last=getattr(self,'last',0) @@ -40,12 +67,27 @@ class BasketBasis(OrderedFolder): return last + def addBasketFile(self,REQUEST=None,fileUpload=None,comment=None,title=""): + """add a file to the basket""" + if fileUpload==None: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addBasketFile.zpt')).__of__(self) + pt.content_type="text/html" + return pt() + else: + id=self.getNewId() + if title=="": + title=fileUpload.filename + + manage_addBasketFile(self,id,title,comment,fileUpload) + if REQUEST: + REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket") + def addBasketText(self,REQUEST=None): """add a text""" id=self.getNewId() manage_addBasketText(self,str(id),'','',RESPONSE=None) if REQUEST: - REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket") + REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket#"+str(id)) def addBasketExternalLink(self,REQUEST=None): """add an external link""" @@ -53,7 +95,7 @@ class BasketBasis(OrderedFolder): manage_addBasketExternalLink(self,str(id),"","","","",RESPONSE=None) if REQUEST: - REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket") + REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket#"+str(id)) def deleteObject(self,id,REQUEST=None): """delete object""" @@ -65,25 +107,25 @@ class BasketBasis(OrderedFolder): """move id one up""" self.moveObjectsUp([id], 1) if REQUEST: - REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket") + REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket#"+id) def moveDown(self,id,REQUEST=None): """move id one up""" self.moveObjectsDown([id], 1) if REQUEST: - REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket") + REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket#"+id) def moveTop(self,id,REQUEST=None): """move to top""" self.moveObjectsToTop([id]) if REQUEST: - REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket") + REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket#"+id) def moveBottom(self,id,REQUEST=None): """move to top""" self.moveObjectsToBottom([id]) if REQUEST: - REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket") + REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket#"+id) security.declareProtected('View','getOwner') @@ -91,10 +133,7 @@ class BasketBasis(OrderedFolder): """get Owner as string""" return self.owner - def isAuthorized(self,role="read"): - """check whether actual user is authorized""" - #TODO implement isAuthorized to do type, read or edit - return True + def getActualUserName(self): """get username of actual user""" @@ -120,7 +159,6 @@ class BasketFolder(BasketBasis): ret=[] if mode=='open': - for object in self.getObjects(): if object.publicationStatus=='open': @@ -128,11 +166,11 @@ class BasketFolder(BasketBasis): return ret elif mode=='open_intern': print "open_intern" - if self.groupFolder.isMemberOf('user'): + if self.checkPermission('authorized'): print "---public" for object in self.getObjects(): print object.getId(),object.publicationStatus - if object.publicationStatus=='open_intern': + if object.publicationStatus=='open_intern' or object.publicationStatus=='open': ret.append(object) return ret else: @@ -148,18 +186,16 @@ class BasketFolder(BasketBasis): ret.append(object) return ret - def checkPermission(self,modus): - """check permission""" - if modus=='open': - return True - elif modus=='private': - return self.isMemberOf('admin') - def getCurrentBasket(self): """select this basket for further work""" - return self.REQUEST.cookies.get('vlp_basket',None) - + id=self.REQUEST.cookies.get('vlp_basket',None) + if id: + return getattr(self,id,None) + else: + return None + + def index_html(self,mode='open'): """generische ansicht""" @@ -194,9 +230,16 @@ class BasketFolder(BasketBasis): """add a new basket""" id=self.getNewId() username=self.getActualUserName() - publicatonStatus="private" + publicationStatus="private" manage_addBasket(self,str(id),title,"",username,publicationStatus,RESPONSE=None) newObj=getattr(self,str(id)) + #create a groupfolder + + manage_addGroupFolder(newObj,'groupFolder') + + #add current user to admin group of the new set + + newObj.groupFolder.addUserToGroups(str(self.REQUEST['AUTHENTICATED_USER']),['admin']) if RESPONSE: RESPONSE.redirect(newObj.absolute_url()+'/manageBasket') @@ -224,10 +267,43 @@ class Basket(BasketBasis): security=ClassSecurityInfo() + publicationStatusList=publicationStatusList + manage_options=OrderedFolder.manage_options+( {'label':'manage main','action':'changeBasketForm'}, ) + + def saveButton(self,actualId): + """return the save button""" + ret=""" + save - + + """%actualId + return ret + + def manageUserRights_html(self): + """manage user rights""" + if hasattr(self,"Basket_manageUserRights_template"): + obj=getattr(self,"Basket_manageUserRights_template") + return obj() + else: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketMain_Basket_manageUserRights_standard.zpt')).__of__(self) + pt.content_type="text/html" + return pt() + + + def getBasketObjects(self): + """get all basket objects""" + + objs=self.getObjects() + ret=[] + for x in objs: + if x.meta_type in basketMetatypes: + ret.append(x) + return ret + def checkRef(self,xref): """check if XRef is already in Basket""" @@ -267,6 +343,7 @@ class Basket(BasketBasis): pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeBasket.zpt')).__of__(self) return pt() + def changeBasket(self,title,comment,shortDescription,publicationStatus=None,username=None,accessGroups=None,RESPONSE=None,target=None): ''' init the basket @@ -323,7 +400,7 @@ class Basket(BasketBasis): def changeBasketComments(self,REQUEST): """Change comment of basket elements""" form=REQUEST.form - + for key in form.keys(): splitted=key.split("_") objects=self.ZopeFind(self,obj_ids=[splitted[0]]) @@ -332,7 +409,7 @@ class Basket(BasketBasis): if REQUEST: - REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket") + REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket#"+form.get('actualId','')) def selectThisBasketAsCurrent(self,REQUEST=None): @@ -367,9 +444,18 @@ class Basket(BasketBasis): manage_addBasketXRef(self,str(id),title,comment,xref) if REQUEST: - import random - rd=random.random() - REQUEST.RESPONSE.redirect(REQUEST['HTTP_REFERER']+'&-dummy='+str(rd)) + #import random + #rd=random.random() + urlSplit=REQUEST['HTTP_REFERER'].split("?") + if len(urlSplit)>1: + parsed=cgi.parse_qs(urlSplit[1]) + parsed['-link']=link + qs=urllib.urlencode(parsed,doseq=True) + + else: + qs="" + + REQUEST.RESPONSE.redirect(urlSplit[0]+"?"+qs) else: return True @@ -384,14 +470,14 @@ def manage_addBasket(self,id,title,comme #find username owner=username - newObj=Basket(id,title,comment,owner,publicationStatus,shortDescription,accessGroups) - + newObj=Basket(id,title,comment,owner,publicationStatus,shortDescription) + self._setObject(id,newObj) if RESPONSE is not None: RESPONSE.redirect('manage_main') -class BasketBasis(SimpleItem): +class BasketObject(SimpleItem): """basic class for baskets""" #security=ClassSecurityInfo() @@ -442,8 +528,83 @@ class BasketBasis(SimpleItem): pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','%s_template_standard.zpt'%type)).__of__(self) pt.content_type="text/html" return pt() + +class BasketFile(BasketObject,File): + """class for fileupload""" + meta_type="BasketFile" + + def __init__(self,id,title,comment,content_type='',precondition=''): + """init""" + self.id=id + self.title=title + self.comment=comment + self.content_type=content_type + self.precondition=precondition + + + 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) + + + def upDateFile(self,fileUpload=None,comment=None,title="",REQUEST=None): + """update file""" + + if fileUpload==None: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','upDateBasketFile.zpt')).__of__(self) + pt.content_type="text/html" + return pt() + else: + + if title=="": + title=fileUpload.filename + + self.title=title + if fileUpload: + self.manage_upload(fileUpload) + + if comment: + self.comment=comment + + if REQUEST: + REQUEST.RESPONSE.redirect(self.absolute_url()+"/manageBasket") + + def content_html(self): + """format object as html fragment""" + + + return BasketBasis.content_html(self,"BasketFile") + +def manage_addBasketFile(self,id,title,comment,fileUpload,content_type='',precondition='',REQUEST=None): + """add a basket file""" -class BasketXRef(BasketBasis): + id=str(id) + title=str(title) + content_type=str(content_type) + precondition=str(precondition) + + #id, title = cookId(id, title, file) + + self=self.this() + + # First, we create the file without data: + self._setObject(id, BasketFile(id,title,comment,content_type, precondition)) + + # Now we "upload" the data. By doing this in two steps, we + # can use a database trick to make the upload more efficient. + if fileUpload: + self._getOb(id).manage_upload(fileUpload) + if content_type: + self._getOb(id).content_type=content_type + + if REQUEST is not None: + REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main') + +class BasketXRef(BasketObject): """class for internal references based on xrefs""" #security=ClassSecurityInfo() @@ -496,7 +657,7 @@ def manage_addBasketXRef(self,id,title,c if RESPONSE is not None: RESPONSE.redirect('manage_main') -class BasketInternalLink(BasketBasis): +class BasketInternalLink(BasketObject): """class for internal referencens based on links""" #security=ClassSecurityInfo() @@ -552,7 +713,7 @@ def manage_addBasketInternalLink(self,id RESPONSE.redirect('manage_main') -class BasketExternalLink(BasketBasis): +class BasketExternalLink(BasketObject): """class for external links""" #security=ClassSecurityInfo() @@ -607,7 +768,7 @@ def manage_addBasketExternalLink(self,id RESPONSE.redirect('manage_main') -class BasketText(BasketBasis): +class BasketText(BasketObject): """class for text elements in baskets""" #security=ClassSecurityInfo()