Diff for /ECHO_content/ECHO_collection.py between versions 1.39 and 1.41

version 1.39, 2004/04/14 23:45:58 version 1.41, 2004/04/16 09:45:32
Line 34  import xml.dom.minidom Line 34  import xml.dom.minidom
 import urllib  import urllib
 import xml.dom.minidom  import xml.dom.minidom
 from ECHO_graphicalOverview import javaHandler,javaScriptMain  from ECHO_graphicalOverview import javaHandler,javaScriptMain
   import ECHO_helpers
   
 #List of different types for the graphical linking viewer  #List of different types for the graphical linking viewer
 viewClassificationListMaster=['view point','area']  viewClassificationListMaster=['view point','area']
Line 264  class ECHO_resource(Folder): Line 265  class ECHO_resource(Folder):
   
     viewClassificationList=viewClassificationListMaster      viewClassificationList=viewClassificationListMaster
   
       getSubCols = ECHO_helpers.getSubCols
   
     def content_html(self):      def content_html(self):
         """template fuer content"""          """template fuer content"""
         return content_html(self,'resource')          return content_html(self,'resource')
Line 560  class ECHO_collection(Folder, Persistent Line 563  class ECHO_collection(Folder, Persistent
             for entry in object.__dict__.keys():              for entry in object.__dict__.keys():
                 element=getattr(object,entry)                  element=getattr(object,entry)
                 try:                  try:
                     if element.meta_type=="ECHO_collection":                      if element.meta_type in ["ECHO_collection","ECHO_group"]:
                         collections+="<element name=\""+element.title+"\" url=\""+element.absolute_url()+"\">"                          collections+="<element name=\""+element.title+"\" url=\""+element.absolute_url()+"\">"
                         collections+=getCollection(element,depth)+"</element>\n"                          collections+=getCollection(element,depth)+"</element>\n"
                 except:                  except:
Line 812  class ECHO_collection(Folder, Persistent Line 815  class ECHO_collection(Folder, Persistent
   
         return ids          return ids
           
   <<<<<<< ECHO_collection.py
       getSubCols = ECHO_helpers.getSubCols
   =======
     def getSubCols(self,sortfield="weight"):      def getSubCols(self,sortfield="weight"):
   
         subColTypes=['ECHO_collection','ECHO_externalLink','ECHO_resource']          subColTypes=['ECHO_group','ECHO_collection','ECHO_externalLink','ECHO_resource']
         ids=[]          ids=[]
         for entry in self.__dict__.keys():          for entry in self.__dict__.keys():
             object=getattr(self,entry)              object=getattr(self,entry)
Line 846  class ECHO_collection(Folder, Persistent Line 852  class ECHO_collection(Folder, Persistent
                   
                   
                                   
       
       
 def manage_addECHO_collectionForm(self):  def manage_addECHO_collectionForm(self):
         """Add collection form"""          """Add collection form"""
         pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_collectionForm.zpt').__of__(self)          pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_collectionForm.zpt').__of__(self)
Line 913  class ECHO_group(ECHO_collection): Line 917  class ECHO_group(ECHO_collection):
         if RESPONSE is not None:          if RESPONSE is not None:
             RESPONSE.redirect('manage_main')              RESPONSE.redirect('manage_main')
                           
       def getLogo(self):    
           """logo ausgeben"""
           return "ECHO_groups"
   
     def content_html(self):      def content_html(self):
         """template fuer content"""          """template fuer content"""
         return content_html(self,'group')          return content_html(self,'group')

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


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