Save and edit next button appears on documents without viewer as well.

Made the new recent correspondents filter optional. Disabled by default.

src/documents/admin.py

@@ -94,6 +94,7 @@ class RecentCorrespondentFilter(admin.RelatedFieldListFilter):
 
     def field_choices(self, field, request, model_admin):
         lookups = []
+        if settings.PAPERLESS_RECENT_CORRESPONDENT_YEARS and settings.PAPERLESS_RECENT_CORRESPONDENT_YEARS > 0:
             date_limit = datetime.now() - timedelta(days=365*settings.PAPERLESS_RECENT_CORRESPONDENT_YEARS)
             for c in Correspondent.objects.filter(documents__created__gte = date_limit).distinct():
                 lookups.append( (c.id, c.name) )

src/documents/templates/admin/documents/document/change_form.html

@@ -4,7 +4,7 @@
 
 {{ block.super }}
 
-{% if file_type in "pdf jpg png" %}
+{% if file_type in "asd" %}
 
 	<div id="change_form_twocolumn_parent">
 		<div id="change_form_form_parent"></div>
@@ -23,7 +23,9 @@
 		django.jQuery("#content-main").append(django.jQuery("#change_form_twocolumn_parent"));
 	</script>
 
-	{% if next_object %}
+{% endif %}
+
+{% if next_object %}
 	<script type="text/javascript">//<![CDATA[
 		(function($){
 			$('<input type="submit" value="Save and edit next" name="_saveandeditnext" />')
@@ -32,7 +34,6 @@
 			.prependTo('div.submit-row');
 		})(django.jQuery);
 	//]]></script>
-	{% endif %}
 {% endif %}
 
 {% endblock content %}

src/documents/templates/admin/documents/document/select_object.html

@@ -38,7 +38,7 @@
         <input type="hidden" name="action" value="{{action}}"/>
         <input type="hidden" name="post" value="yes"/>
         <p>
-            <input type="submit" value="{% trans " Confirm" %}" />
+            <input type="submit" value="{% trans "Confirm" %}" />
             <a href="#" class="button cancel-link">{% trans "Go back" %}</a>
         </p>
     </div>

src/documents/templates/admin/documents/document/viewers/viewer_image.html

@@ -1,2 +1 @@
 <img src="{{download_url}}" style="max-width: 100%">
-

src/documents/templates/admin/documents/document/viewers/viewer_pdf.html

@@ -11,12 +11,13 @@
 </div>
 
 <div style="width: 100%; overflow: auto;">
-<canvas id="the-canvas"></canvas>
-    </div>
+    <canvas id="the-canvas"></canvas>
+</div>
 <script type="text/javascript" src="{% static 'documents/js/pdf.js' %}"></script>
 <script type="text/javascript" src="{% static 'documents/js/pdf.worker.js' %}"></script>
-	{# Load and display PDF document#}
-	<script>
+
+{# Load and display PDF document#}
+<script>
 var pdfjsLib = window['pdfjs-dist/build/pdf'];
 
 var pdfDoc = null,
@@ -31,7 +32,7 @@ var pdfDoc = null,
  * Get page info from document, resize canvas accordingly, and render page.
  * @param num Page number.
  */
-  function renderPage(num) {
+function renderPage(num) {
     pageRendering = true;
     // Using promise to fetch the page
     pdfDoc.getPage(num).then(function(page) {
@@ -56,64 +57,74 @@ var pdfDoc = null,
     });
     // Update page counters
     document.getElementById('page_num').textContent = num;
-  }
-  /**
+}
+
+/**
  * If another page rendering in progress, waits until the rendering is
  * finised. Otherwise, executes rendering immediately.
  */
-  function queueRenderPage(num) {
+function queueRenderPage(num) {
     if (pageRendering) {
         pageNumPending = num;
     } else {
         renderPage(num);
     }
-  }
-  /**
+}
+
+/**
  * Displays previous page.
  */
-  function onPrevPage() {
+function onPrevPage() {
     if (pageNum <= 1) {
         return;
     }
     pageNum--;
     queueRenderPage(pageNum);
-  }
-  document.getElementById('prev').addEventListener('click', onPrevPage);
-  /**
+}
+
+document.getElementById('prev').addEventListener('click', onPrevPage);
+
+/**
  * Displays next page.
  */
-  function onNextPage() {
+function onNextPage() {
     if (pageNum >= pdfDoc.numPages) {
         return;
     }
     pageNum++;
     queueRenderPage(pageNum);
-  }
-  document.getElementById('next').addEventListener('click', onNextPage);
-  /**
+}
+
+document.getElementById('next').addEventListener('click', onNextPage);
+
+/**
  * Displays next page.
  */
-  function onZoomIn() {
+function onZoomIn() {
     scale *= 1.2;
     queueRenderPage(pageNum);
-  }
-  document.getElementById('zoomin').addEventListener('click', onZoomIn);
-  /**
+}
+
+document.getElementById('zoomin').addEventListener('click', onZoomIn);
+
+/**
  * Displays next page.
  */
-  function onZoomOut() {
+function onZoomOut() {
     scale /= 1.2;
     queueRenderPage(pageNum);
-  }
-  document.getElementById('zoomout').addEventListener('click', onZoomOut);
-  /**
+}
+
+document.getElementById('zoomout').addEventListener('click', onZoomOut);
+
+/**
  * Asynchronously downloads PDF.
  */
-  pdfjsLib.getDocument("{{download_url}}").then(function (pdfDoc_) {
+pdfjsLib.getDocument("{{download_url}}").then(function (pdfDoc_) {
     pdfDoc = pdfDoc_;
     document.getElementById('page_count').textContent = pdfDoc.numPages;
     // Initial/first page rendering
     renderPage(pageNum);
-  });
-	</script>
+});
+</script>
 

src/paperless/settings.py

@@ -298,4 +298,8 @@ FY_END = os.getenv("PAPERLESS_FINANCIAL_YEAR_END")
 # Specify the default date order (for autodetected dates)
 DATE_ORDER = os.getenv("PAPERLESS_DATE_ORDER", "DMY")
 
-PAPERLESS_RECENT_CORRESPONDENT_YEARS = int(os.getenv("PAPERLESS_RECENT_CORRESPONDENT_YEARS", 1))
+# Specify for how many years a correspondent is considered recent. Recent
+# correspondents will be shown in a separate "Recent correspondents" filter as
+# well. Set to 0 to disable this filter.
+PAPERLESS_RECENT_CORRESPONDENT_YEARS = int(os.getenv(
+    "PAPERLESS_RECENT_CORRESPONDENT_YEARS", 0))