--- MPIWGWeb/MPIWGStaff.py 2005/10/12 19:35:38 1.10.2.5 +++ MPIWGWeb/MPIWGStaff.py 2005/10/14 17:13:37 1.10.2.10 @@ -13,6 +13,7 @@ import bibliography from Globals import package_home from Products.PythonScripts.standard import sql_quote from types import * +from AccessControl import ClassSecurityInfo departmentList="Renn\nRheinberger\nDaston\nKlein\nSibum\nIT\nInstitut\nBibliothek" @@ -33,17 +34,40 @@ class MPIWGStaff(CatalogAware,ZSQLExtend meta_type="MPIWGStaff" default_catalog='MembersCatalog' departmentList=departmentList + security=ClassSecurityInfo() - def createNewDBEntry(self,publish_the_data,id,name,vorname,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by="",e_mail2="",txt="",txt_p="no"): - """lege person in der datenbank an""" + def getConnectionObj(self):#ueberschreibe connection id methode + + return getattr(self.de,self.de.connection_id) + + def isPublished(self): + """gib publications status aus der datenbank aus""" + username=self.getId() + query="select count(publish_the_data) from personal_www where username='%s' and publish_the_data='yes'"%username + + res = self.ZSQLQuery(query) + + if res and res[0].count>0: + return True + else: + return False + def createNewDBEntry(self,publish_the_data,id,name,vorname,username,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by="",e_mail2="",txt="",txt_p="no"): + """lege person in der datenbank an""" + msg="" #test ob id schon existiert if self.ZSQLQuery("select id from personal_www where id='%s'"%id): - return False,"id %s already exists"%id + return False,"ERROR:id %s already exists"%id + + if self.ZSQLQuery("select username from personal_www where username='%s' and publish_the_data='yes'"%username): + + return False,"ERROR:username %s already exists and has data published, id=%s not added (running update again might solve this problem)"%(username,id) + if self.ZSQLQuery("select username from personal_www where username='%s' and not publish_the_data='yes'"%username): + msg="WARNING:username %s not unique but id=%s added"%(username,id) #eintragen - columnlist="publish_the_data,id,name,vorname,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2" - insertTuple=(publish_the_data,id,name,vorname,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2) + columnlist="publish_the_data,id,name,vorname,username,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2" + insertTuple=(publish_the_data,id,name,vorname,username,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2) insert=[] for element in insertTuple: @@ -58,7 +82,20 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if not (txt==""): queryStr="INSERT INTO current_work (id_main,current,publish) VALUES ('%s','%s','%s')"%(id,txt,txt_p) self.ZSQLQuery(queryStr) + + return True,msg + + def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None): + """zpddatedb""" + if not DBid: + DBid=self.getDBId() + self.ZSQLQuery("SET DATESTYLE TO 'German'") + self.ZSQLChange(_table="personal_www",_identify="id=%s"%DBid,publish_the_data=publish_the_data, + date_from=date_from, + date_to=date_to) + + def getPublicationSelectionMode(self): """get publication selection mode, default 'priority'""" return getattr(self,'publicationSelectionMode','priority') @@ -79,10 +116,11 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def updateImage(self,file,publishImage,rename=None,RESPONSE=None): """update image""" - if self.getImageObj(): - self.getImageObj().updateImage(file,rename=None,RESPONSE=None) + if file and not(file.filename==""): + if self.getImageObj(): + self.getImageObj().updateImage(file,rename=None,RESPONSE=None) else: - self.getImageFolder().addImage2(file,fileName=self.getId()) + self.getImageFolder().addImage2(file,fileName=self.getId()) self.publishImage=publishImage @@ -175,7 +213,8 @@ class MPIWGStaff(CatalogAware,ZSQLExtend """change form""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGStaff.zpt')).__of__(self) return pt() - + + security.declareProtected('View management screens','changeMPIWGStaff') def changeMPIWGStaff(self,lastName,firstName,RESPONSE=None): """change it""" self.title="%s, %s"%(lastName,firstName) @@ -184,15 +223,22 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if RESPONSE is not None: RESPONSE.redirect('manage_main') - + + security.declareProtected('View management screens','edit') def edit(self): """Edit the pages""" + #TODO: zusammenspiel mit apache, redirect auf 18080 rausnehmen bzw. zumindest verallgemeinern + if self.REQUEST['SERVER_URL']=="http://www.mpiwg-berlin.mpg.de": + redURL="http://xserve04.mpiwg-berlin.mpg.de:18080/www_neu/de/mitarbeiter/members/%s/edit"%self.getId() + + self.REQUEST.RESPONSE.redirect(redURL) pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff.zpt')).__of__(self) return pt() mainEditFile=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff_main.zpt')) + security.declareProtected('View management screens','changeResearch') def changeResearch(self,noredirect=None): """change the research entries""" newEntries={} @@ -243,7 +289,8 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if not noredirect: self.REQUEST.RESPONSE.redirect(self.REQUEST['HTTP_REFERER']) - + + security.declareProtected('View management screens','editCV') def editCV(self,cv=None,oid=None,RESPONSE=None): """edit Cv""" @@ -258,6 +305,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if RESPONSE: RESPONSE.redirect("editCV") + security.declareProtected('View management screens','editAwards') def editAwards(self,awards=None,oid=None,RESPONSE=None): """edit a awards""" @@ -272,13 +320,14 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if RESPONSE: RESPONSE.redirect("editAwards") + security.declareProtected('View management screens','editTalks') def editTalks(self): """edit talks""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editTalks.zpt')).__of__(self) return pt() - + security.declareProtected('View management screens','editTeaching') def editTeaching(self): """edit Teaching""" @@ -291,6 +340,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend list= [x[0] for x in finds] return "\n".join(list) + security.declareProtected('View management screens','editMainData') def editMainData(self,REQUEST=None,RESPONSE=None,name=None,**argv): """edit main data""" @@ -300,11 +350,11 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return pt() else: - self.ZSQLChange(argv,_table="personal_www",_identify="id=%s"%self.getDBId(),USE_FORM="yes") + self.ZSQLChange(argv,_table="personal_www",_identify="<%s"%self.getDBId(),USE_FORM="yes") if RESPONSE: RESPONSE.redirect("editMainData") - + security.declareProtected('View management screens','newBibliogrpaphy') def newBibliography(self,_docType=None, _addEntry=None,RESPONSE=None,**argv): """add an entry to the bibliography""" @@ -335,18 +385,20 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return True + security.declareProtected('View management screens','editImage') def editImage(self): """edit images""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editImageStaff.zpt')).__of__(self) return pt() + security.declareProtected('View management screens','editBibliography') def editBibliography(self): """edit the bibliography""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editBibliographyEntry.zpt')).__of__(self) return pt() - + security.declareProtected('View management screens','editPublications') def editPublications(self): """edit the bibliographie""" @@ -372,7 +424,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend except: return 0 - + security.declareProtected('View management screens','changePublications') def changePublications(self): """change the publication list""" self.changeResearch(noredirect=True) @@ -381,7 +433,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.REQUEST.RESPONSE.redirect(self.REQUEST['HTTP_REFERER']) - + security.declareProtected('View management screens','addPublications') def addPublications(self,submit=None,REQUEST=None,noredirect=None): """add publications""" @@ -420,11 +472,15 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def getDBId(self): """get id from the personal database""" - search=self.ZSQLInlineSearch(_table='personal_www',username=self.getId()) - if search: + search=self.ZSQLInlineSearch(_table='personal_www',username=self.getId(),publish_the_data='yes') + if search:#name existiert und published, dann nimm diesen falls es mehrereeventuell nich publizierte datensaetze gibt. return search[0].id - else: - return None + else:#nicht publiziert dann nimm einen davon + search2=self.ZSQLInlineSearch(_table='personal_www',username=self.getId()) + if search2: + return search2[0].id + else: + return None