--- ECHO_content/ECHO_collection.py 2004/07/20 18:35:48 1.149
+++ ECHO_content/ECHO_collection.py 2004/07/23 12:29:14 1.151
@@ -921,14 +921,19 @@ class ECHO_resource(Folder,Persistent):
return "ERROR"
ret=[]
- for copyright in obj.getCopyrights():
+ for copyright in obj.getCopyrights(): #copyright - media / partner / copyrightID
- link="copyrightTypes/"+copyright[2]+'/copyright.html'
try:
- copyrightTypeObj=getattr(self.copyrightTypes,copyright[2])
+ if hasattr(self.copyrightTypes,copyright[2]):
+ copyrightTypeObj=getattr(self.copyrightTypes,copyright[2])
+ link="copyrightTypes/"+copyright[2]+'/copyright.html'
+ else:
+ copyrightTypeObj=getattr(obj,copyright[2])
+ link="copyrightModel/"+copyright[2]+'/copyright.html'
+
label=copyrightTypeObj.label
- url=copyrightTypeObj.url
+ url=getattr(copyrightTypeObj, 'url', '')
if url!='':
ret.append((url,copyright[0],copyright[1],copyright[2],label))
@@ -1144,6 +1149,7 @@ class ECHO_resource(Folder,Persistent):
def showMetaDataXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
"""schreibe md"""
+
try:
return writeMetadata(self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate,xmlfrag="yes")
@@ -2736,7 +2742,7 @@ class ECHO_root(Folder,Persistent,Implic
return retStr
- def copyrightTypeSelector_HTML(self,selected=None,first=None):
+ def copyrightTypeSelector_HTML(self, object=None, selected=None,first=None):
"""give type selector"""
if not first:
@@ -2757,8 +2763,13 @@ class ECHO_root(Folder,Persistent,Implic
retStr+="""