--- ECHO_content/ECHO_collection.py 2004/06/25 11:02:16 1.130 +++ ECHO_content/ECHO_collection.py 2004/06/28 14:42:32 1.131 @@ -2716,13 +2716,14 @@ class ECHO_partner(Image,Persistent): meta_type="ECHO_partner" - def __init__(self, id, title,url, file, copyrightType, person, email, country, content_type='', precondition=''): + def __init__(self, id, title,url, file, copyrightType, person, email, country, color, content_type='', precondition=''): self.__name__=id self.title=title self.url=url self.person=person self.email=email self.country=country + self.color=color self.precondition=precondition self.copyrightType=copyrightType data, size = self._read_data(file) @@ -2734,12 +2735,13 @@ class ECHO_partner(Image,Persistent): ) - def changeECHO_partner(self,url,copyrightType,person, email, country, RESPONSE=None): + def changeECHO_partner(self,url,copyrightType,person, email, country, color, RESPONSE=None): """Change main information""" self.url=url self.person=person self.email=email self.country=country + self.color=color self.copyrightType=copyrightType if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -2759,7 +2761,7 @@ manage_addECHO_partnerForm=DTMLFile('dtm -def manage_addECHO_partner(self, id,file,url, person, email, country, copyrightType='', title='', precondition='', content_type='', +def manage_addECHO_partner(self, id, url, person, email, country, color, file=None, copyrightType='', title='', precondition='', content_type='', REQUEST=None): """ Add a new ECHO_partner object. @@ -2778,7 +2780,7 @@ def manage_addECHO_partner(self, id,file self=self.this() # First, we create the image without data: - self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, content_type, precondition)) + self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, color, 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.