Merge pull request #670 from upconsulting/develop

Develop

README.md

@@ -16,4 +16,4 @@ The main application should be run from ``isiscb.wsgi``.
 
 Worker processes should be run from ``isiscb.celery``.
 
-The following variables must be set in your environment:
+

isiscb/curation/templates/curation/list_view.html

@@ -131,8 +131,8 @@
   {% if page.has_other_pages %}
   <ul class="pagination pagination-sm">
     {% if page.has_previous %}
-      <li><a href="?page=1">&laquo;</a></li>
-      <li><a href="?page={{ page.previous_page_number }}">Prev</a></li>
+      <li><a href="?page=1&search={{search_key}}">&laquo;</a></li>
+      <li><a href="?page={{ page.previous_page_number }}&search={{search_key}}">Prev</a></li>
     {% else %}
       <li class="disabled"><span>&laquo;</span></li>
       <li class="disabled"><span>Prev</span></li>
@@ -141,14 +141,14 @@
       {% if page.number == i %}
         <li class="active"><span>{{ i }} <span class="sr-only">(current)</span></span></li>
       {% elif i > page.number|add:-5 and i < page.number|add:5 %}
-        <li><a href="?page={{ i }}">{{ i }}</a></li>
+        <li><a href="?page={{ i }}&search={{search_key}}">{{ i }}</a></li>
       {% elif i == page.number|add:-5 or i == page.number|add:5 %}
-        <li><a href="?page={{ i }}">...</a></li>
+        <li><a href="?page={{ i }}&search={{search_key}}">...</a></li>
       {% endif %}
     {% endfor %}
     {% if page.has_next %}
-      <li><a href="?page={{ page.next_page_number }}">Next</a></li>
-      <li><a href="?page={{ paginator.num_pages }}">&raquo;</a></li>
+      <li><a href="?page={{ page.next_page_number }}&search={{search_key}}">Next</a></li>
+      <li><a href="?page={{ paginator.num_pages }}&search={{search_key}}">&raquo;</a></li>
     {% else %}
       <li class="disabled"><span>Next</span></li>
       <li class="disabled"><span>&raquo;</span></li>

isiscb/isisdata/templates/isisdata/authority.html

@@ -678,7 +678,7 @@ <h4 class="modal-title" id="myModalLabel">Related Publishers</h4>
         <ul class="unselected_facets">
           {% for facet in related_publisher_facet %}
             <li>
-              {% include 'isisdata/fragment_facet_link.html' with facet_field='citation_publisher_ids_exact' %}<br>
+              {% include 'isisdata/fragment_facet_link.html' with facet_field='citation_publisher_ids' %}<br>
             </li>
           {% endfor %}
         </ul>
@@ -703,7 +703,7 @@ <h4 class="modal-title" id="myModalLabel">Related Journals</h4>
         <ul class="unselected_facets">
           {% for facet in related_journal_facet %}
             <li>
-              {% include 'isisdata/fragment_facet_link.html' with facet_field='citation_periodical_ids_exact' %}<br>
+              {% include 'isisdata/fragment_facet_link.html' with facet_field='citation_periodical_ids' %}<br>
             </li>
           {% endfor %}
         </ul>

requirements.txt

@@ -40,7 +40,7 @@ django-simple-captcha==0.5.12
 django-simple-history==2.8.0
 django-storages==1.9.1
 djangorestframework==3.11.0
-djangorestframework-filters==0.11.1
+#djangorestframework-filters==0.11.1
 docker==4.2.0
 docker-compose==1.25.4
 docker-py==1.10.6