Mercurial > hg > MPIWGWeb

changeset 71:ad2e970ffd9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with e5d7223053809b37e83a2cc8590e9bcfbe1958c0
author dwinter
date Sun, 05 May 2013 12:36:28 +0200
parents fd167f42cf34 (diff) e5d722305380 (current diff)
children 5cb46852ac05
files MPIWGRoot.py MPIWGStaff.py zpt/MPIWGFolderChangeWeight.zpt zpt/MPIWGNamesForm.zpt zpt/addPublications.zpt zpt/addPublicationsBib.zpt zpt/bibliography.zpt zpt/changePublications_special.zpt zpt/editAdditionalLinks.zpt zpt/editAwards.zpt zpt/editBibliographyEntry.zpt zpt/editCV.zpt zpt/editDownloads.zpt zpt/editHistoricalNames.zpt zpt/editImageStaff.zpt zpt/editMPIWGStaff.zpt zpt/editMPIWGStaff_main.zpt zpt/editMainData.zpt zpt/editProfile.zpt zpt/editPublications.zpt zpt/editTalks.zpt zpt/editTeaching.zpt zpt/edit_MPIWGDisciplinesThemes.zpt zpt/edit_MPIWGDisciplinesThemesNeu.zpt zpt/edit_MPIWGKeywords.zpt zpt/edit_MPIWGRelatedPublications.zpt zpt/edit_MPIWGStaff.zpt zpt/edit_imageForm.zpt zpt/harvest_main.zpt zpt/harvest_members_main.zpt zpt/members_main.zpt zpt/newBibliographyEntry.zpt zpt/newBibliographyEntryDocType.zpt zpt/no_project.zpt zpt/previewFrame.zpt zpt/project/extendedBibliography_template.zpt zpt/projectImageView.zpt zpt/project_main.zpt zpt/publications_full_main.zpt zpt/talks_full_main.zpt zpt/teaching_full_main.zpt
diffstat 2 files changed, 24 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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) 
--- 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