--- ECHO_content/ECHO_collection.py 2004/05/28 10:43:05 1.93 +++ ECHO_content/ECHO_collection.py 2004/05/28 11:06:32 1.94 @@ -444,7 +444,15 @@ class ECHO_resource(Folder,Persistent): def getCopyright(self): """gib link auf copyright notiz aus""" - return """copyright""" + 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 """c%s"""%(link,label) def getCredits(self): """Ausgabe der credits""" @@ -453,7 +461,7 @@ class ECHO_resource(Folder,Persistent): else: 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 """Festlegen der ID""" @@ -466,6 +474,7 @@ class ECHO_resource(Folder,Persistent): self.credits=toList(credits) self.description=description self.contentType=contentType + self.copyrightType=copyrightType self.renderingType=renderingType self.responsible=responsible self.resourceID=resourceID @@ -937,10 +946,10 @@ 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""" - 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)