--- ECHO_content/ECHO_Nav.py 2004/09/27 14:39:59 1.47 +++ ECHO_content/ECHO_Nav.py 2004/11/27 22:38:43 1.51 @@ -12,9 +12,9 @@ from Products.PageTemplates.ZopePageTemp import os.path from Globals import package_home import urllib -from ECHO_helpers import displayTypes,checkOnlyOneInGroup +from ECHO_helpers import * from ECHO_collection import content_html - +from types import * from Globals import DTMLFile @@ -31,7 +31,12 @@ from Globals import package_home import urllib from ECHO_helpers import displayTypes,checkOnlyOneInGroup from ECHO_collection import content_html +import zLOG +try: + from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder +except: + zLOG.LOG('ECHO_Nav',zLOG.INFO,'ZSQLSimpleSearch not supported') @@ -51,6 +56,7 @@ class ECHO_ZCatalogElement(SimpleItem): self.weight=weight self.content=contentType + manage_options= SimpleItem.manage_options+( {'label':'Main Config','action':'changeECHO_ZCatalogElementForm'}, ) @@ -75,7 +81,7 @@ class ECHO_ZCatalogElement(SimpleItem): def changeECHO_ZCatalogElementForm(self): """change""" - pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_ZCatalogElement.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeECHO_ZCatalogElement.zpt')).__of__(self) return pt() def changeECHO_ZCatalogElement(self,title,field,catalogId,baseUrl,weight,contentType,RESPONSE=None): @@ -116,7 +122,7 @@ class ECHO_ZCatalogElement(SimpleItem): def manage_addECHO_ZCatalogElementForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_ZCatalogElement.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddECHO_ZCatalogElement.zpt')).__of__(self) return pt() def manage_addECHO_ZCatalogElement(self,id,title,field,baseUrl,weight,contentType,RESPONSE=None): @@ -140,9 +146,9 @@ class ECHO_contentType(Image): def changeECHO_contentTypeForm(self): """Change the description text""" - pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_contentType.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeECHO_contentType.zpt')).__of__(self) return pt() - + def changeECHO_contentType(self,description,RESPONSE=None): """Change the Content""" self.description=description @@ -238,7 +244,7 @@ class ECHO_sqlElement(SimpleItem): def changeECHO_sqlElementForm(self): """change""" - pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_sqlElement.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeECHO_sqlElement.zpt')).__of__(self) return pt() def changeECHO_sqlElement(self,title,query,field,searchField,baseUrl,weight,contentType,RESPONSE=None): @@ -254,25 +260,12 @@ class ECHO_sqlElement(SimpleItem): if RESPONSE is not None: RESPONSE.redirect('manage_main') - 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) - 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): + try: + searchQuery=ZSQLExtendFolder.ZSQLSimpleSearch + except: + zLOG.LOG('ECHO_Nav',zLOG.INFO,'ZSQLSimpleSearch not supported') + + def getNavList(self): """ausgabe der treffer list für navigation""" records=self.searchQuery() @@ -293,7 +286,7 @@ class ECHO_sqlElement(SimpleItem): def manage_addECHO_sqlElementForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_sqlElement.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddECHO_sqlElement.zpt')).__of__(self) return pt() def manage_addECHO_sqlElement(self,id,title,query,field,searchField,baseUrl,weight,contentType,RESPONSE=None): @@ -304,14 +297,14 @@ def manage_addECHO_sqlElement(self,id,ti RESPONSE.redirect('manage_main') -class ECHO_pageTemplate(ZopePageTemplate): +class ECHO_pageTemplate(ZopePageTemplate,ECHO_basis): """pageTemplate Objekt""" meta_type="ECHO_pageTemplate" _default_content_fn = os.path.join(package_home(globals()), 'html/ECHO_pageTemplateDefault.html') - manage_options=ZopePageTemplate.manage_options+( + manage_options=ZopePageTemplate.manage_options+ECHO_basis.manage_options+( {'label':'Main Config','action':'changeECHO_pageTemplateMainForm'}, ) @@ -321,7 +314,7 @@ class ECHO_pageTemplate(ZopePageTemplate def changeECHO_pageTemplateMainForm(self): """change""" - pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateMain.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeECHO_pageTemplateMain.zpt')).__of__(self) return pt() def changeECHO_pageTemplateMain(self,weight,contentType,label,description,RESPONSE=None,isAlwaysClickable=None,suffix=None,prefix=None): @@ -336,14 +329,7 @@ class ECHO_pageTemplate(ZopePageTemplate if RESPONSE is not None: RESPONSE.redirect('manage_main') - - def getLabel(self): - if hasattr(self,'label'): - return self.label.encode('utf-8') - - else: - return 0 - + def getWeight(self): """get weight""" if hasattr(self,'weight'): @@ -370,7 +356,7 @@ class ECHO_pageTemplate(ZopePageTemplate def manage_addECHO_pageTemplateForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_pageTemplate.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddECHO_pageTemplate.zpt')).__of__(self) return pt() from urllib import quote @@ -430,7 +416,7 @@ class ECHO_navigation(Folder): def ECHO_cacheManageForm(self): """change form""" - pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_cacheManageForm').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ECHO_cacheManageForm')).__of__(self) pt.content_type="text/html" return pt() @@ -470,8 +456,10 @@ class ECHO_navigation(Folder): return "changed all CM in: "+self.title - displayedMetaTypes=displayTypes + + displayableMetaTypes=displayTypes + def getImageViewers(self): """images""" viewers=self.ZopeFind(self.standardImageViewer,obj_metatypes=['OSAS_ViewerObject']) @@ -486,22 +474,26 @@ class ECHO_navigation(Folder): self.id=id self.title=title self.pathToHierarchy=pathToHierarchy - + self.displayedMetaTypes=displayTypes + manage_options = Folder.manage_options+( {'label':'Main Config','action':'ECHO_navigationConfigForm'}, {'label':'Cache','action':'ECHO_cacheManageForm'}, ) - + displayedMetaTypes=displayTypes + def ECHO_navigationConfigForm(self): """configForm""" - pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_navigation.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeECHO_navigation.zpt')).__of__(self) return pt() - def ECHO_navigationConfig(self,title,pathToHierarchy,RESPONSE=None): + def ECHO_navigationConfig(self,title,pathToHierarchy,displayedMetaTypes=displayTypes,RESPONSE=None): """config""" self.title=title self.pathToHierarchy=pathToHierarchy + self.displayedMetaTypes=toList(displayedMetaTypes)[0:] + if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -619,13 +611,14 @@ class ECHO_navigation(Folder): label=temp[x][1].title.encode('utf-8') else: label=temp[x][1].title.encode('utf-8') - + if location: + loc=getattr(temp[x][1],'location','top') if (loc==location): - listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) + listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url())+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) else: - listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) + listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url())+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) return listNav @@ -770,7 +763,9 @@ class ECHO_navigation(Folder): return nr+1 def secondNavElements(self): - """Zweite Ordnung""" + """Zweite Ordnung Navigationselemente + + """ hash=self.createNavHash(2,checkOnly="no") actual_url=self.REQUEST['URL'] @@ -849,7 +844,7 @@ class ECHO_navigation(Folder): def manage_addECHO_navigationForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_navigation.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddECHO_navigation.zpt')).__of__(self) return pt() def manage_addECHO_navigation(self,id,title,pathToHierarchy,RESPONSE=None):