--- MPIWGWeb/MPIWGStaff.py 2009/09/30 16:42:47 1.10.2.69 +++ MPIWGWeb/MPIWGStaff.py 2011/05/18 10:52:29 1.10.2.75 @@ -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==""): @@ -369,9 +369,14 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if result is not None: # Got a cached value. return result - - pt = getTemplate(self, "members_main") - # Execute the template in a new security context. + + # look for individual page + if self.hasObject("index.html"): + pt = getattr(self, "index.html") + # else use template + else: + pt = getTemplate(self, "members_main") + # Execute the template in a new security context. security.addContext(self) try: @@ -451,7 +456,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff.zpt')).__of__(self) - logging.error("XX:"+email.Utils.formatdate().split("-")[0]+'GMT') + logging.debug("XX:"+email.Utils.formatdate().split("-")[0]+'GMT') return pt() mainEditFile=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff_main.zpt')) @@ -632,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): @@ -708,7 +713,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMainData.zpt')).__of__(self) return pt() else: - self.ZSQLChange(argv,_table="personal_www",_identify="lower(key)=%s"%self.getKeyUTF8().lower(),USE_FORM="yes") + self.ZSQLChange(argv,_table="personal_www",_identify="lower(key)=%s"%utf8ify(self.getKey().lower()),USE_FORM="yes") if RESPONSE: self.redirect(RESPONSE,"editMainData")