--- MPIWGWeb/MPIWGStaff.py 2009/09/30 17:08:40 1.10.2.71 +++ MPIWGWeb/MPIWGStaff.py 2010/09/08 10:41:37 1.10.2.74 @@ -236,7 +236,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend """publish the image??, default no""" return getattr(self,'publishImage','no') - def updateImage(self,file,publishImage,rename=None,RESPONSE=None): + def updateImage(self,publishImage,file=None,rename=None,RESPONSE=None): """update image""" if file and not(file.filename==""): @@ -371,9 +371,10 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return result # look for individual page - pt = getattr(self, "index.html") + if self.hasObject("index.html"): + pt = getattr(self, "index.html") # else use template - if not pt: + else: pt = getTemplate(self, "members_main") # Execute the template in a new security context. security.addContext(self) @@ -636,7 +637,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend """erzeugt ein automatisches Profil aus den alten Eintraegen CV, Current work, und research interests""" ret="" - founds=self.ZSQLInlineSearch(_table='research_interest',key_main=person.key) + founds=self.ZSQLInlineSearch(_table='research_interest',key_main=person.getKeyUTF8()) if founds: ret="

Research interests:


" for found in self.sortPriority(founds):