Mercurial > hg > MPIWGWeb
changeset 226:4f2ed4dc50e6
clean up use of member-key.
| author | casties |
|---|---|
| date | Tue, 29 Oct 2013 17:56:18 +0100 |
| parents | e87c1475b3d6 |
| children | a328c112e372 |
| files | MPIWGStaff.py |
| diffstat | 1 files changed, 17 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/MPIWGStaff.py Tue Oct 29 17:39:12 2013 +0100 +++ b/MPIWGStaff.py Tue Oct 29 17:56:18 2013 +0100 @@ -242,6 +242,7 @@ return ret,len(ret) + security.declareProtected('View management screens','createNewDBEntry') def createNewDBEntry(self,publish_the_data,key,name,vorname,titles_new,position,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by="",e_mail2="",txt="",txt_p="no",stay_at_mpiwg="",group="",web_object_created="no",current_work=""): """lege person in der datenbank an""" @@ -252,7 +253,8 @@ date_from="date_none" msg="" #test ob id schon existiert - if self.ZSQLQuery("select key from personal_www where key='%s'"%id): + #if self.ZSQLQuery("select key from personal_www where key='%s'"%id): + if self.getMember(key=id) is not None: return False,"ERROR:key%s already exists"%key #eintragen @@ -260,16 +262,19 @@ insertTuple=(publish_the_data,key,name,vorname,titles_new,position,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2,stay_at_mpiwg,web_object_created,group,current_work,"yes") insert=[] + insertStr = "" for element in insertTuple: if element=="date_none": # date_none eintrag wird zu null uebersetzt - insert.append('null') + insert.append(None) else: - insert.append("%s"%self.ZSQLQuote(element)) + insert.append(element) - insertStr=",".join(insert) + #insertStr=",".join(insert) + insertStr=("%s," * len(insert))[:-1] queryStr="INSERT INTO personal_www (%s) VALUES (%s)"%(columnlist,insertStr) #self.ZSQLQuery("SET DATESTYLE TO 'German'") - self.ZSQLQuery(queryStr) + #self.ZSQLQuery(queryStr) + self.executeZSQL(queryStr, insert) logging.info("createNewDBEntry %s:"%queryStr) #currentwork #if not (current_work==""): @@ -279,30 +284,26 @@ return True,msg + + security.declareProtected('View management screens','addEmails') def addEmails(self,RESPONSE): """add emails to the members from form""" - memberFolder=getattr(self,'members') args=self.REQUEST.form arg_k=args.keys() arg_k.remove("submit") ret="<html><body>" for key in arg_k: - k=key - - qstr="select * from personal_www where key=%s"%self.ZSQLQuote(k) - res=self.executeZSQL(qstr)[0] if args[key]!="": #email-adresse wurde eingetragen #create the object e_mail=args[key] - - - qstr="update personal_www set web_object_created='yes',e_mail='%s@mpiwg-berlin.mpg.de' where key=%s"%(e_mail,self.ZSQLQuote(k)) - self.executeZSQL(qstr) + qstr="update personal_www set web_object_created='yes', e_mail=%s where key=%s" + self.executeZSQL(qstr, ["%s@mpiwg-berlin.mpg.de"%e_mail, key]) - ret+="<p>Added: %s</p>"%k - + ret+="<p>Added: %s</p>"%key return ret+"</body></html>" + + def manage_addMPIWGStaffFolderForm(self): """form for adding the project""" pt=PageTemplateFile('zpt/addMPIWGStaffFolderForm', globals()).__of__(self)