MPIWGWeb/MPIWGStaff.py - diff

Return to MPIWGStaff.py CVS log

Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/MPIWGStaff.py between versions 1.10.2.69 and 1.10.2.75

version 1.10.2.69, 2009/09/30 16:42:47	version 1.10.2.75, 2011/05/18 10:52:29
Line 236 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 236 class MPIWGStaff(CatalogAware,ZSQLExtend
"""publish the image??, default no"""	"""publish the image??, default no"""
return getattr(self,'publishImage','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"""	"""update image"""

if file and not(file.filename==""):	if file and not(file.filename==""):
Line 370 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 370 class MPIWGStaff(CatalogAware,ZSQLExtend
# Got a cached value.	# Got a cached value.
return result	return result

	# look for individual page
	if self.hasObject("index.html"):
	pt = getattr(self, "index.html")
	# else use template
	else:
pt = getTemplate(self, "members_main")	pt = getTemplate(self, "members_main")
# Execute the template in a new security context.	# Execute the template in a new security context.
security.addContext(self)	security.addContext(self)
Line 451 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 456 class MPIWGStaff(CatalogAware,ZSQLExtend
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff.zpt')).__of__(self)	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()	return pt()

mainEditFile=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff_main.zpt'))	mainEditFile=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff_main.zpt'))
Line 632 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 637 class MPIWGStaff(CatalogAware,ZSQLExtend
"""erzeugt ein automatisches Profil aus den alten Eintraegen CV, Current work, und research interests"""	"""erzeugt ein automatisches Profil aus den alten Eintraegen CV, Current work, und research interests"""

ret=""	ret=""
founds=self.ZSQLInlineSearch(_table='research_interest',key_main=person.key)	founds=self.ZSQLInlineSearch(_table='research_interest',key_main=person.getKeyUTF8())
if founds:	if founds:
ret="<p class=\"bio_section_header\">Research interests: </p><br/>"	ret="<p class=\"bio_section_header\">Research interests: </p><br/>"
for found in self.sortPriority(founds):	for found in self.sortPriority(founds):
Line 708 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 713 class MPIWGStaff(CatalogAware,ZSQLExtend
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMainData.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMainData.zpt')).__of__(self)
return pt()	return pt()
else:	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:	if RESPONSE:
self.redirect(RESPONSE,"editMainData")	self.redirect(RESPONSE,"editMainData")

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.10.2.69
changed lines
	Added in v.1.10.2.75