--- MPIWGWeb/MPIWGStaff.py	2005/10/13 18:00:36	1.10.2.6
+++ MPIWGWeb/MPIWGStaff.py	2005/10/14 16:32:09	1.10.2.8
@@ -34,6 +34,22 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     default_catalog='MembersCatalog'
     departmentList=departmentList
     
+    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=""
@@ -98,10 +114,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)
-        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
         
@@ -206,6 +223,9 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
 
     def edit(self):
         """Edit the pages"""
+	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()