From 11477ab3101aed7af356e3794dc5655f8f35bda4 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 8 Oct 2018 12:25:18 +0200
Subject: [PATCH] Polish organization name treatment
---
.../journals/publication_detail.html | 6 ++---
organizations/models.py | 22 ++++---------------
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/journals/templates/journals/publication_detail.html b/journals/templates/journals/publication_detail.html
index a52c4ad13..8c03853e6 100644
--- a/journals/templates/journals/publication_detail.html
+++ b/journals/templates/journals/publication_detail.html
@@ -116,7 +116,7 @@
<ul class="list list-unstyled m-2">
{% for aff in affiliations_list %}
- <li><sup>{{ forloop.counter }}</sup> <a href="{{ aff.get_absolute_url }}">{{ aff.name_full }}</a></li>
+ <li><sup>{{ forloop.counter }}</sup> <a href="{{ aff.get_absolute_url }}">{{ aff.full_name_with_acronym }}</a></li>
{% endfor %}
</ul>
</div>
@@ -132,9 +132,9 @@
{% for funder in publication.get_all_funders %}
{% if funder.organization %}
{% if funder.name != funder.organization.name and funder.name != funder.organization.name_original %}
- <li>{{ funder }} (through Organization: <a href="{{ funder.organization.get_absolute_url }}">{{ funder.organization.name_and_acronym }}</a>)</li>
+ <li>{{ funder }} (through Organization: <a href="{{ funder.organization.get_absolute_url }}">{{ funder.organization.full_name_with_acronym }}</a>)</li>
{% else %}
- <li><a href="{{ funder.organization.get_absolute_url }}">{{ funder.organization.name_and_acronym }}</a></li>
+ <li><a href="{{ funder.organization.get_absolute_url }}">{{ funder.organization.full_name_with_acronym }}</a></li>
{% endif %}
{% else %}
<li><a href="{{ funder.get_absolute_url }}">{{ funder }}</a></li>
diff --git a/organizations/models.py b/organizations/models.py
index 5a1f335dc..8297e3da9 100644
--- a/organizations/models.py
+++ b/organizations/models.py
@@ -67,34 +67,20 @@ class Organization(models.Model):
def __str__(self):
return self.name
- def name_and_acronym(self):
- if self.acronym:
- return '%s (%s)' % (self.name, self.acronym)
- return self.name
-
- def name_full(self):
- text = ''
- if self.name_original:
- text += self.name_original + ' / '
- text += self.name
- if self.acronym:
- text += ' (' + self.acronym + ')'
- return text
-
@property
def full_name(self):
full_name_str = ""
if self.name_original:
full_name_str += "%s / " % self.name_original
- full_name_str += "%s" % self
+ full_name_str += "%s" % self.name
return full_name_str
@property
def full_name_with_acronym(self):
- full_name_str = ""
+ full_name_str = self.full_name
if self.acronym:
- full_name_str += "[%s] " % self.acronym
- return full_name_str + self.full_name
+ full_name_str += " [%s]" % self.acronym
+ return full_name_str
def get_absolute_url(self):
return reverse('organizations:organization_details', kwargs = {'pk': self.id})
--
GitLab