From 519da860b0258f8121cca403a07a81d3afc8cc18 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Sun, 8 Jul 2018 16:15:22 +0200
Subject: [PATCH] Improve and debug
---
.../journals/author_affiliations.html | 10 +++--
.../templates/xml/publication_crossref.html | 2 +-
.../partners/_organization_card.html | 38 +++++++++++--------
.../templates/partners/organization_list.html | 1 -
partners/views.py | 1 +
5 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/journals/templates/journals/author_affiliations.html b/journals/templates/journals/author_affiliations.html
index 7bffde83d..e44ef4aa5 100644
--- a/journals/templates/journals/author_affiliations.html
+++ b/journals/templates/journals/author_affiliations.html
@@ -29,7 +29,7 @@
{% for auth in publication.authors.all %}
<li>
<div class="row">
- <div class="col-6">
+ <div class="col-5">
<h3>{{ auth }}</h3>
<ul>
{% for aff in auth.affiliations.all %}
@@ -39,14 +39,18 @@
{% endfor %}
</ul>
</div>
- <div class="col-6">
- <h4>Add an affiliation:</h4>
+ <div class="col-5">
+ <h4>Add an affiliation (at moment of publication) to this Author:</h4>
<form action="{% url 'journals:author_affiliation_update' doi_label=publication.doi_label pk=auth.pk %}" method="post">
{% csrf_token %}
{{ add_affiliation_form|bootstrap }}
<input type="submit" name="submit" value="Add" class="btn btn-outline-secondary">
</form>
</div>
+ <div class="col-2">
+ <p>Can't find it in the selector? <a href="{% url 'partners:organization_create' %}" target=_"blank">Add a new organization to our database</a></p>
+ </div>
+
</div>
</li>
{% empty %}
diff --git a/journals/templates/xml/publication_crossref.html b/journals/templates/xml/publication_crossref.html
index 6cda89d65..98a53ad15 100644
--- a/journals/templates/xml/publication_crossref.html
+++ b/journals/templates/xml/publication_crossref.html
@@ -56,7 +56,7 @@
<given_name>{{ author_object.first_name }}</given_name>
<surname>{{ author_object.last_name }}</surname>
{% if author_object.affiliations %}
- {% for aff in author_object.affiliations %}
+ {% for aff in author_object.affiliations.all %}
<affiliation>{{ aff.name }}</affiliation>
{% endfor %}
{% endif %}
diff --git a/partners/templates/partners/_organization_card.html b/partners/templates/partners/_organization_card.html
index b7e1b1a1e..df7ea69e4 100644
--- a/partners/templates/partners/_organization_card.html
+++ b/partners/templates/partners/_organization_card.html
@@ -45,22 +45,28 @@
<div class="tab-pane pt-4" id="authors" role="tabpanel" aria-labelledby="authors-tab">
<h3>Associated Authors:</h3>
- <h4>Registered Contributors:</h4>
- <ul>
- {% for author in org.get_contributor_authors %}
- <li><a href="{{ author.get_absolute_url }}">{{ author }}</a></li>
- {% empty %}
- <li>No Contributors found</li>
- {% endfor %}
- </ul>
- <h4>Unregistered:</h4>
- <ul>
- {% for author in org.get_unregistered_authors %}
- <li>{{ author }}</li>
- {% empty %}
- <li>No unregistered author found</li>
- {% endfor %}
- </ul>
+ <div class="row">
+ <div class="col-6">
+ <h4>Registered Contributors:</h4>
+ <ul>
+ {% for author in org.get_contributor_authors %}
+ <li><a href="{{ author.get_absolute_url }}">{{ author }}</a></li>
+ {% empty %}
+ <li>No Contributors found</li>
+ {% endfor %}
+ </ul>
+ </div>
+ <div class="col-6">
+ <h4>Unregistered:</h4>
+ <ul>
+ {% for author in org.get_unregistered_authors %}
+ <li>{{ author }}</li>
+ {% empty %}
+ <li>No unregistered author found</li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
</div>
<div class="tab-pane pt-4" id="partnership" role="tabpanel" aria-labelledby="partnership-tab">
diff --git a/partners/templates/partners/organization_list.html b/partners/templates/partners/organization_list.html
index 9fbf534c8..63793aa3b 100644
--- a/partners/templates/partners/organization_list.html
+++ b/partners/templates/partners/organization_list.html
@@ -12,7 +12,6 @@
</div>
-<hr/>
<div class="row">
<div class="col-12">
<table class="table table-hover mb-5">
diff --git a/partners/views.py b/partners/views.py
index fdec6d9d9..0643c0ccd 100644
--- a/partners/views.py
+++ b/partners/views.py
@@ -48,6 +48,7 @@ class OrganizationCreateView(PermissionsMixin, CreateView):
"""
permission_required = 'scipost.can_manage_organizations'
model = Organization
+ fields = '__all__'
template_name = 'partners/organization_create.html'
success_url = reverse_lazy('partners:organization_list')
--
GitLab