--- MPIWGWeb/MPIWGStaff.py	2005/10/14 17:13:37	1.10.2.10
+++ MPIWGWeb/MPIWGStaff.py	2005/10/24 22:56:22	1.10.2.14
@@ -52,7 +52,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         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"):
+    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",stay_at_mpiwg=""):
         """lege person in der datenbank an"""
         msg=""
         #test ob id schon existiert
@@ -66,15 +66,15 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         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,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)
+        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,stay_at_mpiwg"
+        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,stay_at_mpiwg)
         
         insert=[]
         for element in insertTuple:
             insert.append("'%s'"%element)
         
         insertStr=",".join(insert)
-        queryStr="INSERT INTO personal_www (%s) VALUES (%s)"%(columnlist,insertTuple)
+        queryStr="INSERT INTO personal_www (%s) VALUES (%s)"%(columnlist,insertStr)
         
         self.ZSQLQuery(queryStr)
         
@@ -85,15 +85,16 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         
         return True,msg
     
-    def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None): 
+    def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None,stay_at_mpiwg=""): 
         """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)
+                                   date_to=date_to,stay_at_mpiwg=stay_at_mpiwg)
                   
           
     def getPublicationSelectionMode(self):
@@ -115,12 +116,12 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     
     def updateImage(self,file,publishImage,rename=None,RESPONSE=None):
         """update image"""
-        
-	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())
+
+        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.publishImage=publishImage
         
@@ -228,16 +229,24 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     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()
+        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)
+                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'))
 
+    def getPathStyle(self, path, selected, style=""):
+        """returns a string with the given style + 'sel' if path == selected."""
+
+        if path == selected:
+            return style + 'sel'
+        else:
+            return style    
+
     security.declareProtected('View management screens','changeResearch')
     def changeResearch(self,noredirect=None):
         """change the research entries"""