From 2ae6448b9bdbb9d99297647f66ddf18502e0a574 Mon Sep 17 00:00:00 2001 From: Nicolas Demonte Date: Wed, 13 Mar 2019 11:55:56 +0100 Subject: [PATCH] Display type of related documents #22014 --- .../locales/collective.dms.basecontent.pot | 10 +++++- .../LC_MESSAGES/collective.dms.basecontent.po | 10 +++++- .../LC_MESSAGES/collective.dms.basecontent.po | 10 +++++- .../LC_MESSAGES/collective.dms.basecontent.po | 10 +++++- .../dms/basecontent/related-docs-display.pt | 31 +++++++++++++------ src/collective/dms/basecontent/relateddocs.py | 13 ++++++-- 6 files changed, 69 insertions(+), 15 deletions(-) diff --git a/src/collective/dms/basecontent/locales/collective.dms.basecontent.pot b/src/collective/dms/basecontent/locales/collective.dms.basecontent.pot index da9bb57..b8e716e 100644 --- a/src/collective/dms/basecontent/locales/collective.dms.basecontent.pot +++ b/src/collective/dms/basecontent/locales/collective.dms.basecontent.pot @@ -114,7 +114,11 @@ msgstr "" msgid "There is no version note for this document." msgstr "" -#: ../browser/listing.py:122 +#: ../related-docs-display.pt:21 +msgid "Title" +msgstr "" + +#: ../browser/listing.py:150 msgid "To read" msgstr "" @@ -122,6 +126,10 @@ msgstr "" msgid "Treating groups" msgstr "" +#: ../related-docs-display.pt:20 +msgid "Type" +msgstr "" + #: ../browser/viewlets.py:92 msgid "Validation applications" msgstr "" diff --git a/src/collective/dms/basecontent/locales/en/LC_MESSAGES/collective.dms.basecontent.po b/src/collective/dms/basecontent/locales/en/LC_MESSAGES/collective.dms.basecontent.po index 92ec921..159131e 100644 --- a/src/collective/dms/basecontent/locales/en/LC_MESSAGES/collective.dms.basecontent.po +++ b/src/collective/dms/basecontent/locales/en/LC_MESSAGES/collective.dms.basecontent.po @@ -112,7 +112,11 @@ msgstr "" msgid "There is no version note for this document." msgstr "" -#: ../browser/listing.py:122 +#: ../related-docs-display.pt:21 +msgid "Title" +msgstr "" + +#: ../browser/listing.py:150 msgid "To read" msgstr "" @@ -120,6 +124,10 @@ msgstr "" msgid "Treating groups" msgstr "" +#: ../related-docs-display.pt:20 +msgid "Type" +msgstr "" + #: ../browser/viewlets.py:92 msgid "Validation applications" msgstr "" diff --git a/src/collective/dms/basecontent/locales/fr/LC_MESSAGES/collective.dms.basecontent.po b/src/collective/dms/basecontent/locales/fr/LC_MESSAGES/collective.dms.basecontent.po index 5115910..99aba4a 100644 --- a/src/collective/dms/basecontent/locales/fr/LC_MESSAGES/collective.dms.basecontent.po +++ b/src/collective/dms/basecontent/locales/fr/LC_MESSAGES/collective.dms.basecontent.po @@ -117,7 +117,11 @@ msgstr "Il n'y a aucune demande de validation" msgid "There is no version note for this document." msgstr "Aucune version n'a encore été créée pour ce document." -#: ../browser/listing.py:145 +#: ../related-docs-display.pt:21 +msgid "Title" +msgstr "Titre" + +#: ../browser/listing.py:150 msgid "To read" msgstr "À lire" @@ -125,6 +129,10 @@ msgstr "À lire" msgid "Treating groups" msgstr "Services en charge du traitement" +#: ../related-docs-display.pt:20 +msgid "Type" +msgstr "Type" + #: ../browser/viewlets.py:92 msgid "Validation applications" msgstr "Demandes de validation" diff --git a/src/collective/dms/basecontent/locales/nl/LC_MESSAGES/collective.dms.basecontent.po b/src/collective/dms/basecontent/locales/nl/LC_MESSAGES/collective.dms.basecontent.po index a51af8e..ce51931 100644 --- a/src/collective/dms/basecontent/locales/nl/LC_MESSAGES/collective.dms.basecontent.po +++ b/src/collective/dms/basecontent/locales/nl/LC_MESSAGES/collective.dms.basecontent.po @@ -112,7 +112,11 @@ msgstr "" msgid "There is no version note for this document." msgstr "" -#: ../browser/listing.py:122 +#: ../related-docs-display.pt:21 +msgid "Title" +msgstr "" + +#: ../browser/listing.py:150 msgid "To read" msgstr "" @@ -120,6 +124,10 @@ msgstr "" msgid "Treating groups" msgstr "" +#: ../related-docs-display.pt:20 +msgid "Type" +msgstr "" + #: ../browser/viewlets.py:92 msgid "Validation applications" msgstr "" diff --git a/src/collective/dms/basecontent/related-docs-display.pt b/src/collective/dms/basecontent/related-docs-display.pt index 89a7a8c..5a48681 100644 --- a/src/collective/dms/basecontent/related-docs-display.pt +++ b/src/collective/dms/basecontent/related-docs-display.pt @@ -1,4 +1,5 @@ , \ No newline at end of file + onkeyup view/onkeyup"> + + + + + + + + + + + + +
TypeTitle
+ + +
+ \ No newline at end of file diff --git a/src/collective/dms/basecontent/relateddocs.py b/src/collective/dms/basecontent/relateddocs.py index c502c7d..6228620 100644 --- a/src/collective/dms/basecontent/relateddocs.py +++ b/src/collective/dms/basecontent/relateddocs.py @@ -33,6 +33,11 @@ class RelatedDocsWidget(MultiContentTreeWidget): term = self.terms.getTermByToken(v) return term.title + def get_content_type(self, v): + portal = self.context.portal_url.getPortalObject() + document = portal.unrestrictedTraverse(v) + return document.Type() + def update(self): super(RelatedDocsWidget, self).update() if self.mode == 'display': @@ -42,7 +47,11 @@ class RelatedDocsWidget(MultiContentTreeWidget): @CachedProperty def tuples(self): - refs = [(self.get_url(x), self.get_label(x)) for x in self.value] + refs = [( + self.get_url(x), + self.get_label(x), + self.get_content_type(x), + ) for x in self.value] if self.display_backrefs: intids = getUtility(IIntIds) catalog = getUtility(ICatalog) @@ -57,7 +66,7 @@ class RelatedDocsWidget(MultiContentTreeWidget): if not sm.checkPermission('View', obj): continue url = self.get_url(ref.from_path) - tp = (url, obj.Title()) + tp = (url, obj.Title(), obj.Type()) if tp not in refs: refs.append(tp) return refs