ECHO_content/ECHO_Nav.py - diff

Return to ECHO_Nav.py CVS log

Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_Nav.py between versions 1.35 and 1.39

version 1.35, 2004/06/25 11:02:16	version 1.39, 2004/08/17 15:22:14
Line 89 class ECHO_ZCatalogElement(SimpleItem):	Line 89 class ECHO_ZCatalogElement(SimpleItem):

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

def getKeywordList(self):	def getKeywordList(self):
return getattr(self,self.catalogId).uniqueValuesFor(self.field)	return getattr(self,self.catalogId).uniqueValuesFor(self.field)

def getNavList(self):	def getNavList(self):
"""ausgabe der treffer list für navigation"""	"""ausgabe der treffer list für navigation"""

records=self.getKeywordList()	records=self.getKeywordList()


if not records:	if not records:
return []	return []
else:	else:
Line 203 class ECHO_sqlElement(SimpleItem):	Line 204 class ECHO_sqlElement(SimpleItem):
else:	else:
self.searchField=searchField	self.searchField=searchField
self.baseUrl=baseUrl	self.baseUrl=baseUrl
self.weight=weight
self.content=contentType	self.content=contentType

manage_options= SimpleItem.manage_options+(	manage_options= SimpleItem.manage_options+(
Line 251 class ECHO_sqlElement(SimpleItem):	Line 252 class ECHO_sqlElement(SimpleItem):
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

def searchQuery(self):	def searchQuery(self,query=None,obj=None):
	#presently a hack, tests if search is of the search method, if not look at the next level.
	#
	#return self.ZSQLsimpleSearch(var=self.query)
	if not query:
	query=self.query

	if self.search.meta_type=="Z SQL Method":
return self.search(var=self.query)	return self.search(var=self.query)
	else:
	if self.aq_parent.aq_parent.search.meta_type=="Z SQL Method":
	return self.aq_parent.aq_parent.search(var=self.query)
	else:
	return []




def getNavList(self):	def getNavList(self):
"""ausgabe der treffer list für navigation"""	"""ausgabe der treffer list für navigation"""

records=self.searchQuery()	records=self.searchQuery()


if not records:	if not records:
return []	return []
else:	else:
Line 291 class ECHO_pageTemplate(ZopePageTemplate	Line 310 class ECHO_pageTemplate(ZopePageTemplate
'html/ECHO_pageTemplateDefault.html')	'html/ECHO_pageTemplateDefault.html')

manage_options=ZopePageTemplate.manage_options+(	manage_options=ZopePageTemplate.manage_options+(
{'label':'Main Config','action':'changeECHO_pageTemplateWeightForm'},	{'label':'Main Config','action':'changeECHO_pageTemplateMainForm'},
)	)

def content_html(self):	def content_html(self):
"""content_html"""	"""content_html"""
return content_html(self,'pageTemplate')	return content_html(self,'pageTemplate')

def changeECHO_pageTemplateWeightForm(self):	def changeECHO_pageTemplateMainForm(self):
"""change"""	"""change"""
pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateWeight.zpt').__of__(self)	pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateMain.zpt').__of__(self)
return pt()	return pt()

def changeECHO_pageTemplateWeight(self,weight,contentType,label,RESPONSE=None):	def changeECHO_pageTemplateMain(self,weight,contentType,label,description,RESPONSE=None):
"""change"""	"""change"""
self.weight=weight	self.weight=weight
self.contentType=contentType	self.contentType=contentType
self.label=label	self.label=label
	self.description=description

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')
Line 454 class ECHO_navigation(Folder):	Line 474 class ECHO_navigation(Folder):
obj=objtemp	obj=objtemp


for keys in obj.__dict__.keys():
x=getattr(obj,keys)	for keys in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes):
	x=keys[1]

if hasattr(x,"meta_type"):	if hasattr(x,"meta_type"):

if x.meta_type in self.displayedMetaTypes:	if x.meta_type in self.displayedMetaTypes:
Line 508 class ECHO_navigation(Folder):	Line 530 class ECHO_navigation(Folder):
#print "TEMP",temp,self.tempSorted(temp, field=sortField)	#print "TEMP",temp,self.tempSorted(temp, field=sortField)

for x in self.tempSorted(temp, field=sortField):	for x in self.tempSorted(temp, field=sortField):

if not temp[x][1].title == "":	if not temp[x][1].title == "":

if (temp[x][1].meta_type=="ECHO_sqlElement") or (temp[x][1].meta_type=="ECHO_ZCatalogElement"):	if (temp[x][1].meta_type=="ECHO_sqlElement") or (temp[x][1].meta_type=="ECHO_ZCatalogElement"):
Line 519 class ECHO_navigation(Folder):	Line 542 class ECHO_navigation(Folder):
# add label falls existiert und nicht leer	# add label falls existiert und nicht leer
if hasattr(temp[x][1],'label'):	if hasattr(temp[x][1],'label'):
if not temp[x][1].label=='':	if not temp[x][1].label=='':
label=temp[x][1].label.decode('utf-8','ignore')	try:
	label=temp[x][1].label.encode('utf-8','ignore')
	except:
	label=temp[x][1].label
else:	else:
label=temp[x][1].title.encode('utf-8')	label=temp[x][1].title.encode('utf-8')
else:	else:
Line 532 class ECHO_navigation(Folder):	Line 557 class ECHO_navigation(Folder):
listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))	listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))
else:	else:
listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))	listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))
#print self.getId(),start
#print listNav

#html=""
#for k in listNav:
# print k
# html=html+"<a href='%s'>%s</a> "% (self.absolute_url()+createPath(k[1][1].absolute_url()),k[0])

return listNav	return listNav

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

Removed from v.1.35
changed lines
	Added in v.1.39