From 341c200e32cda2b5594b249343ed0ec226487010 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Wed, 20 Dec 2017 15:22:42 -0400
Subject: [PATCH] Fix unable to add already exisiting unreg.author to
publication
---
journals/models.py | 4 ++--
journals/views.py | 2 +-
urls0.py | 41 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 3 deletions(-)
create mode 100644 urls0.py
diff --git a/journals/models.py b/journals/models.py
index de8c4ded3..9ffed4c25 100644
--- a/journals/models.py
+++ b/journals/models.py
@@ -147,12 +147,12 @@ class Publication(models.Model):
# Authors
authors = models.ManyToManyField('scipost.Contributor', blank=True,
related_name='publications')
- authors_unregistered = models.ManyToManyField(UnregisteredAuthor, blank=True,
+ authors_unregistered = models.ManyToManyField('journals.UnregisteredAuthor', blank=True,
related_name='publications')
first_author = models.ForeignKey('scipost.Contributor', blank=True, null=True,
on_delete=models.CASCADE,
related_name='first_author_publications')
- first_author_unregistered = models.ForeignKey(UnregisteredAuthor, blank=True, null=True,
+ first_author_unregistered = models.ForeignKey('journals.UnregisteredAuthor', blank=True, null=True,
on_delete=models.CASCADE,
related_name='first_author_publications')
authors_claims = models.ManyToManyField('scipost.Contributor', blank=True,
diff --git a/journals/views.py b/journals/views.py
index d1428b475..ae5562dfd 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -403,7 +403,7 @@ def add_author(request, publication_id, contributor_id=None, unregistered_author
def add_unregistered_author(request, publication_id, unregistered_author_id):
publication = get_object_or_404(Publication, id=publication_id)
unregistered_author = get_object_or_404(UnregisteredAuthor, id=unregistered_author_id)
- publication.unregistered_authors.add(unregistered_author)
+ publication.authors_unregistered.add(unregistered_author)
publication.save()
return redirect(reverse('journals:manage_metadata',
kwargs={'doi_label': publication.doi_label}))
diff --git a/urls0.py b/urls0.py
new file mode 100644
index 000000000..5b9f0faaa
--- /dev/null
+++ b/urls0.py
@@ -0,0 +1,41 @@
+from django.conf.urls import url
+
+from submissions.constants import SUBMISSIONS_COMPLETE_REGEX
+
+from . import views
+
+urlpatterns = [
+ # Fellowships
+ url(r'^fellowships/$', views.fellowships, name='fellowships'),
+ url(r'^fellowships/add$', views.fellowship_add, name='fellowship_add'),
+ url(r'^fellowships/(?P<id>[0-9]+)/$', views.fellowship_detail, name='fellowship'),
+ url(r'^fellowships/(?P<id>[0-9]+)/edit$', views.fellowship_edit, name='fellowship_edit'),
+ url(r'^fellowships/(?P<id>[0-9]+)/terminate$', views.fellowship_terminate,
+ name='fellowship_terminate'),
+ url(r'^fellowships/submissions/{regex}/$'.format(
+ regex=SUBMISSIONS_COMPLETE_REGEX), views.submission_pool,
+ name='submission'),
+ url(r'^fellowships/submissions/{regex}/voting$'.format(
+ regex=SUBMISSIONS_COMPLETE_REGEX), views.submission_voting_fellows,
+ name='submission_voting_fellows'),
+ url(r'^fellowships/submissions/{regex}/add$'.format(
+ regex=SUBMISSIONS_COMPLETE_REGEX), views.submission_add_fellowship,
+ name='submission_add_fellowship'),
+ url(r'^fellowships/submissions/{regex}/voting/add$'.format(
+ regex=SUBMISSIONS_COMPLETE_REGEX), views.submission_add_fellowship_voting,
+ name='submission_add_fellowship_voting'),
+ url(r'^fellowships/(?P<id>[0-9]+)/submissions/{regex}/remove$'.format(
+ regex=SUBMISSIONS_COMPLETE_REGEX), views.fellowship_remove_submission_voting,
+ name='fellowship_remove_submission_voting'),
+
+ url(r'^fellowships/(?P<id>[0-9]+)/submissions/{regex}/remove$'.format(
+ regex=SUBMISSIONS_COMPLETE_REGEX), views.fellowship_remove_submission,
+ name='fellowship_remove_submission'),
+ url(r'^fellowships/(?P<id>[0-9]+)/submissions/add$',
+ views.fellowship_add_submission, name='fellowship_add_submission'),
+
+ url(r'^fellowships/(?P<id>[0-9]+)/proceedings/add$',
+ views.fellowship_add_proceedings, name='fellowship_add_proceedings'),
+ url(r'^fellowships/(?P<id>[0-9]+)/proceedings/(?P<proceedings_id>[0-9]+)/remove$',
+ views.fellowship_remove_proceedings, name='fellowship_remove_proceedings'),
+]
--
GitLab