[BACK]Return to ECHO_collection.py CVS log [TXT] [DIR] Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_collection.py between versions 1.93 and 1.94

version 1.93, 2004/05/28 10:43:05 version 1.94, 2004/05/28 11:06:32
Line 444  class ECHO_resource(Folder,Persistent): Line 444  class ECHO_resource(Folder,Persistent):
   
     def getCopyright(self):      def getCopyright(self):
         """gib link auf copyright notiz aus"""          """gib link auf copyright notiz aus"""
         return """<a href="#">copyright</a>"""          if hasattr(self,'copyrightType'):
               obj=getattr(self.copyrightTypes,'copyrightType')
           else:
               obj=getattr(self.copyrightTypes,'generic')
   
           label=obj.label
           link="copyrightTypes/"+obj.getId()+'/copyright.html'
           
           return """<a target="_blank" href="%s">c%s</a>"""%(link,label)
           
     def getCredits(self):      def getCredits(self):
         """Ausgabe der credits"""          """Ausgabe der credits"""
Line 453  class ECHO_resource(Folder,Persistent): Line 461  class ECHO_resource(Folder,Persistent):
         else:          else:
             return []              return []
           
     def __init__(self,id,link,metalink,resourceID,title,label,description,contentType,renderingType,responsible,credits,weight,coords):      def __init__(self,id,link,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords):
   
         self.id = id          self.id = id
         """Festlegen der ID"""          """Festlegen der ID"""
Line 466  class ECHO_resource(Folder,Persistent): Line 474  class ECHO_resource(Folder,Persistent):
         self.credits=toList(credits)          self.credits=toList(credits)
         self.description=description          self.description=description
         self.contentType=contentType          self.contentType=contentType
       self.copyrightType=copyrightType
     self.renderingType=renderingType      self.renderingType=renderingType
         self.responsible=responsible          self.responsible=responsible
         self.resourceID=resourceID          self.resourceID=resourceID
Line 937  def manage_addECHO_resourceForm(self): Line 946  def manage_addECHO_resourceForm(self):
   
   
   
 def manage_addECHO_resource(self,id,title,label,description,responsible,link,metalink,weight,resourceID=None,contentType=None,renderingType=None,credits=None,coords=None,RESPONSE=None):  def manage_addECHO_resource(self,id,title,label,description,responsible,link,metalink,weight,copyrightType=None,resourceID=None,contentType=None,renderingType=None,credits=None,coords=None,RESPONSE=None):
     """addaresource"""      """addaresource"""
   
     newObj=ECHO_resource(id,link,metalink,resourceID,title,label,description,contentType,renderingType,responsible,credits,weight,coords)      newObj=ECHO_resource(id,link,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords)
   
     self._setObject(id,newObj)      self._setObject(id,newObj)
   
Removed from v.1.93  
changed lines
  Added in v.1.94

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