Mercurial > hg > MPIWGWeb

changeset 234:774ee7595e0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bugs in createNewDBEntry.
author casties
date Wed, 27 Nov 2013 15:56:38 +0100
parents e2d2f018a8e2
children 7fcb9b18c4d1
files MPIWGStaff.py
diffstat 1 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/MPIWGStaff.py	Thu Nov 14 18:09:16 2013 +0100
+++ b/MPIWGStaff.py	Wed Nov 27 15:56:38 2013 +0100
@@ -245,26 +245,27 @@
                 
     
     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=""):
+    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"""
 
         if date_to=="": # wenn date_to leer
-             date_to="date_none"
+            date_to="date_none"
         
         if date_from=="": # wenn date_fromleer
-             date_from="date_none"
+            date_from="date_none"
         msg=""
         #test ob id schon existiert
         #if self.ZSQLQuery("select key from personal_www where key='%s'"%id):
-        if self.getMember(key=id) is not None:
+        if self.getMember(key=key) is not None:
             return False,"ERROR:key%s already exists"%key
         
         #eintragen
         columnlist="""publish_the_data,key,last_name,first_name,titles_new,status,e_mail,e_mail_p,date_from,date_to,department,home_inst,funded_by,e_mail2,date_stay_at_mpiwg,web_object_created,"group",current_work,current_work_p """
-        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")
+        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(None)
@@ -276,6 +277,8 @@
         queryStr="INSERT INTO personal_www (%s) VALUES (%s)"%(columnlist,insertStr)
         #self.ZSQLQuery("SET DATESTYLE TO 'German'")
         #self.ZSQLQuery(queryStr)
+        # TODO: is there a better way for dates?
+        self.executeZSQL("SET DATESTYLE TO 'German'")
         self.executeZSQL(queryStr, insert)
         logging.info("createNewDBEntry %s:"%queryStr)
         #currentwork