From dcdd71692bf5e47fbdafcbf2a20bfa1aeb1abf54 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 21 Nov 2016 15:36:09 +0100
Subject: [PATCH] Correct overview privacy bug
---
journals/views.py | 25 ++++++++++---------
.../scipost/Fellow_activity_overview.html | 5 ++++
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/journals/views.py b/journals/views.py
index fe686b928..34a688972 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -32,16 +32,16 @@ from guardian.shortcuts import assign_perm
-from requests.adapters import HTTPAdapter
-from requests.packages.urllib3.poolmanager import PoolManager
-import ssl
+# from requests.adapters import HTTPAdapter
+# from requests.packages.urllib3.poolmanager import PoolManager
+# import ssl
-class MyAdapter(HTTPAdapter):
- def init_poolmanager(self, connections, maxsize, block=False):
- self.poolmanager = PoolManager(num_pools=connections,
- maxsize=maxsize,
- block=block,
- ssl_version=ssl.PROTOCOL_TLSv1)
+# class MyAdapter(HTTPAdapter):
+# def init_poolmanager(self, connections, maxsize, block=False):
+# self.poolmanager = PoolManager(num_pools=connections,
+# maxsize=maxsize,
+# block=block,
+# ssl_version=ssl.PROTOCOL_TLSv1)
############
# Journals
@@ -536,18 +536,19 @@ def test_metadata_xml_deposit(request, doi_string):
Makes use of the python requests module.
"""
publication = get_object_or_404 (Publication, doi_string=doi_string)
- url = 'https://test.crossref.org/servlet/deposit'
+ url = 'http://test.crossref.org/servlet/deposit'
#headers = {'Content-type': 'multipart/form-data'}
params = {'operation': 'doMDUpload',
'login_id': settings.CROSSREF_LOGIN_ID,
'login_passwd': settings.CROSSREF_LOGIN_PASSWORD,
}
#files = {'fname': ('metadata.xml', publication.metadata_xml, 'multipart/form-data', {'Expires': '0'})}
- files = {'file': ('metadata.xml', publication.metadata_xml)}
+ files = {'fname': ('metadata.xml', publication.metadata_xml, 'multipart/form-data')}
r = requests.post(url,
params=params,
files=files,
- verify=settings.CERTFILE,
+ #verify=settings.CERTFILE,
+ #verify=False,
)
#s = requests.Session()
#s.mount('https://', MyAdapter())
diff --git a/scipost/templates/scipost/Fellow_activity_overview.html b/scipost/templates/scipost/Fellow_activity_overview.html
index dfc112df8..8609847ca 100644
--- a/scipost/templates/scipost/Fellow_activity_overview.html
+++ b/scipost/templates/scipost/Fellow_activity_overview.html
@@ -9,6 +9,7 @@
{% block bodysup %}
{% load scipost_extras %}
+{% load submissions_extras %}
<section>
<div class="flex-container">
@@ -53,8 +54,10 @@
<ul>
{% for assignment in assignments_of_Fellow %}
{% if assignment.accepted and not assignment.completed %}
+ {% if request.user|is_not_author_of_submission:assignment.submission.arxiv_identifier_w_vn_nr %}
{{ assignment.header_as_li }}
{% endif %}
+ {% endif %}
{% endfor %}
</ul>
@@ -62,8 +65,10 @@
<ul>
{% for assignment in assignments_of_Fellow %}
{% if assignment.completed %}
+ {% if request.user|is_not_author_of_submission:assignment.submission.arxiv_identifier_w_vn_nr %}
{{ assignment.header_as_li }}
{% endif %}
+ {% endif %}
{% endfor %}
</ul>
--
GitLab