--- MPIWGWeb/MPIWGStaff.py	2008/09/03 11:13:44	1.10.2.56
+++ MPIWGWeb/MPIWGStaff.py	2008/09/12 12:28:48	1.10.2.60
@@ -22,6 +22,7 @@ import time
 import logging
 import email
 import re
+from OFS.Cache import Cacheable
 
 from MPIWGHelper import *
 #ersetzt logging
@@ -56,8 +57,8 @@ def createNewDBEntry(self,publish_the_da
             return False,"ERROR:key%s already exists"%key
         
         #eintragen
-        columnlist="""publish_the_data,key,last_name,first_name,title,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" """
-        insertTuple=(publish_the_data,key,name,vorname,title,position,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2,stay_at_mpiwg,web_object_created,group)
+        columnlist="""publish_the_data,key,last_name,first_name,title,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,title,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=[]
         for element in insertTuple:
@@ -72,13 +73,13 @@ def createNewDBEntry(self,publish_the_da
         self.ZSQLQuery(queryStr)
         logging.info("QQQQ %s:"%queryStr)
         #currentwork
-        if not (current_work==""):
-            queryStr="INSERT INTO current_work (key_main,current,publish) VALUES ('%s',%s,'%s')"%(key,self.ZSQLQuote(current_work),"yes")
+        #if not (current_work==""):
+        #    queryStr="INSERT INTO current_work (key_main,current,publish) VALUES ('%s',%s,'%s')"%(key,self.ZSQLQuote(current_work),"yes")
 
-            self.ZSQLQuery(queryStr)
+        #  self.ZSQLQuery(queryStr)
         
         return True,msg
-class MPIWGStaff(CatalogAware,ZSQLExtendFolder):
+class MPIWGStaff(CatalogAware,ZSQLExtendFolder,Cacheable):
     """Staff"""
 
     meta_type="MPIWGStaff"
@@ -163,7 +164,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         self.publicationSelectionMode=publicationSelectionMode
         
         if RESPONSE:
-            self.redirect(RESPONSE,"<Publications")
+            self.redirect(RESPONSE,"editPublications")
             
     
     def downloadCV(self,RESPONSE):
@@ -595,12 +596,12 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         
         
         if (person.current_work) and (not person.current_work==""):
-            ret="<p class=\"bio_section_header\">Current work: </p><br/>"
+            ret+="<p class=\"bio_section_header\">Current work: </p><br/>"
       
             ret+=person.current_work+"<br/>"
-    
-        ret+="<br/>"
-        ret+=self.formatAscii(person.cv)
+    	if (person.cv) and (not person.cv==""):
+            ret+="<p class=\"bio_section_header\">Curriculum Vitae: </p><br/>"
+	    ret+=self.formatAscii(person.cv)
         
         return ret
     security.declareProtected('View management screens','editDownloads')