# HG changeset patch
# User dwinter
# Date 1367750188 -7200
# Node ID ad2e970ffd9f56aeb12cef5be781fa7fe1a7056b
# Parent  fd167f42cf343486933b60d599f49d2873b5acf7# Parent  e5d7223053809b37e83a2cc8590e9bcfbe1958c0
Merge with e5d7223053809b37e83a2cc8590e9bcfbe1958c0

diff -r e5d722305380 -r ad2e970ffd9f MPIWGRoot.py
diff -r e5d722305380 -r ad2e970ffd9f MPIWGStaff.py
--- a/MPIWGStaff.py	Fri May 03 22:40:21 2013 +0200
+++ b/MPIWGStaff.py	Sun May 05 12:36:28 2013 +0200
@@ -1740,5 +1740,28 @@
             
            
         return self.executeZSQL(query,[self.getKey()])
+    
+    
+    def generateProfileForPerson(self,REQUEST=None):
+        """erzeugt ein automatisches Profil aus den alten Eintraegen  CV, Current work, und research interests"""
+        
+        ret=""
+        #founds=self.ZSQLInlineSearch(_table='research_interest',key_main=person.getKeyUTF8())
+        founds=self.ZSQLInlineSearch(_table='research_interest',key_main=self.getKey())
+        if founds:
+            ret="<p class=\"bio_section_header\">Research interests: </p><br/>"
+        for found in self.sortPriority(founds):
+            ret+=found.interest+"<br/>"
+        
+        
+        if (self.content.current_work) and (not self.content.current_work==""):
+            ret+="<p class=\"bio_section_header\">Current work: </p><br/>"
+      
+            ret+=self.current_work+"<br/>"
+        if (self.content.cv) and (not self.content.cv==""):
+            ret+="<p class=\"bio_section_header\">Curriculum Vitae: </p><br/>"
+        ret+=self.formatAscii(self.content.cv)
+        
+        return ret
            
 InitializeClass(MPIWGStaffMember) 
diff -r e5d722305380 -r ad2e970ffd9f MPIWGTemplate.py
--- a/MPIWGTemplate.py	Fri May 03 22:40:21 2013 +0200
+++ b/MPIWGTemplate.py	Sun May 05 12:36:28 2013 +0200
@@ -99,7 +99,7 @@
 
 def manage_addMPIWGTemplate(self, MPIWGType,id, text="",title=None,weight=0,REQUEST=None):
     "Add a Page Template with optional file content."
-    if type(MPIWGType)==StringType:
+    if isinstance(MPIWGType, str):
         MPIWGTypes=[MPIWGType]
     else:
         MPIWGTypes=MPIWGType