diff --git a/CHANGES.rst b/CHANGES.rst index 64d1310..7103faf 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,9 @@ Changelog 1.1 (unreleased) ---------------- +- Added logo and activity rich field on organization type. + [thomasdesvenain] + - Fixed generate id from title on held positions and persons. [thomasdesvenain] diff --git a/src/collective/contact/core/browser/organization.py b/src/collective/contact/core/browser/organization.py index a7e7655..828177b 100644 --- a/src/collective/contact/core/browser/organization.py +++ b/src/collective/contact/core/browser/organization.py @@ -35,6 +35,7 @@ class Organization(BaseView): parent_organizations = [] sub_organizations = [] positions = [] + activity = '' def update(self): super(Organization, self).update() @@ -45,6 +46,7 @@ class Organization(BaseView): factory = getUtility(IVocabularyFactory, "OrganizationTypesOrLevels") vocabulary = factory(self.context) self.type = vocabulary.getTerm(organization.organization_type).title + self.activity = self.context.activity contactable = IContactable(organization) organizations = contactable.organizations diff --git a/src/collective/contact/core/browser/person.py b/src/collective/contact/core/browser/person.py index d8649e0..e51f636 100644 --- a/src/collective/contact/core/browser/person.py +++ b/src/collective/contact/core/browser/person.py @@ -14,7 +14,6 @@ class Person(BaseView): person_title = '' gender = '' held_positions = '' - photo = '' def update(self): super(Person, self).update() diff --git a/src/collective/contact/core/browser/templates/organization.pt b/src/collective/contact/core/browser/templates/organization.pt index 529c7df..4882bf1 100644 --- a/src/collective/contact/core/browser/templates/organization.pt +++ b/src/collective/contact/core/browser/templates/organization.pt @@ -7,12 +7,21 @@

+ +
+
+ + +
+