--- ECHO_content/ECHO_collection.py 2004/06/07 08:50:14 1.98 +++ ECHO_content/ECHO_collection.py 2004/06/07 14:30:16 1.99 @@ -2314,12 +2314,15 @@ class ECHO_partner(Image,Persistent): meta_type="ECHO_partner" - def __init__(self, id, title,url, file, copyrightType,content_type='', precondition=''): + def __init__(self, id, title,url, file, copyrightType, person, email, country, content_type='', precondition=''): self.__name__=id self.title=title self.url=url + self.person=person + self.email=email + self.country=country self.precondition=precondition - self.copyrightType=copyrightType + self.copyrightType=copyrightType data, size = self._read_data(file) content_type=self._get_content_type(file, data, id, content_type) self.update_data(data, content_type, size) @@ -2329,10 +2332,13 @@ class ECHO_partner(Image,Persistent): ) - def changeECHO_partner(self,url,copyrightType,RESPONSE=None): + def changeECHO_partner(self,url,copyrightType,person, email, country, RESPONSE=None): """Change main information""" self.url=url - self.copyrightType=copyrightType + self.person=person + self.email=email + self.country=country + self.copyrightType=copyrightType if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -2351,7 +2357,7 @@ manage_addECHO_partnerForm=DTMLFile('dtm -def manage_addECHO_partner(self, id, file,url, title='', precondition='', content_type='', +def manage_addECHO_partner(self, id, file,url, person, email, country, title='', precondition='', content_type='', REQUEST=None): """ Add a new ECHO_partner object. @@ -2370,7 +2376,7 @@ def manage_addECHO_partner(self, id, fil self=self.this() # First, we create the image without data: - self._setObject(id, ECHO_partner(id,title,url,'',content_type, precondition)) + self._setObject(id, ECHO_partner(id,title,url,'',person, email, country, content_type, precondition)) # Now we "upload" the data. By doing this in two steps, we # can use a database trick to make the upload more efficient.