Merge branch 'versions/minor' into features/workflow_email_action

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>

.gitlab-ci.yml

@@ -63,6 +63,7 @@ job_docker_nightly:
   only:
     - nightly
     - staging
+    - /^clients\/.+$/
 
 job_documentation_build:
   stage: build_documentation
@@ -160,6 +161,7 @@ job_push_python:
     - releases/python
     - staging
     - nightly
+    - /^clients\/.+$/
 
 test-mysql:
   <<: *test_base

.tx/config

@@ -115,12 +115,6 @@ source_lang = en
 source_file = mayan/apps/events/locale/en/LC_MESSAGES/django.po
 type = PO
 
-[mayan-edms.file_caching-3-0]
-file_filter = mayan/apps/file_caching/locale/<lang>/LC_MESSAGES/django.po
-source_lang = en
-source_file = mayan/apps/file_caching/locale/en/LC_MESSAGES/django.po
-type = PO
-
 [mayan-edms.file_metadata-3-0]
 file_filter = mayan/apps/file_metadata/locale/<lang>/LC_MESSAGES/django.po
 source_lang = en
@@ -228,10 +222,3 @@ file_filter = mayan/apps/user_management/locale/<lang>/LC_MESSAGES/django.po
 source_lang = en
 source_file = mayan/apps/user_management/locale/en/LC_MESSAGES/django.po
 type = PO
-
-[mayan-edms.weblink-3-0]
-file_filter = mayan/apps/weblinks/locale/<lang>/LC_MESSAGES/django.po
-source_lang = en
-source_file = mayan/apps/weblinks/locale/en/LC_MESSAGES/django.po
-type = PO
-

CHANGES_BC.rst

@@ -0,0 +1,14 @@
+- Use Select2 widget for the document type selection form.
+- Update source column matching to be additive and not exclusive.
+- Add two columns to show the number of documents per workflow and
+  workflow state.
+- Sort module.
+- Add link to sort individual indexes.
+- Support exclusions from source columns.
+- Improve source column exclusion. Improve for model subclasses in partial querysets.
+- Add sortable index instance label column.
+- Add rectangle drawing transformation.
+- Redactions app.
+- Remove duplicated trashed document preview.
+- Add label to trashed date and time document source column.
+- Tag created event fix.

HISTORY.rst

@@ -1,3 +1,8 @@
+Importer branch
+===============
+* Add a reusable task to upload documents.
+* Add MVP of the importer app.
+
 3.3 (2019-XX-XX)
 ================
 - Add support for icon shadows.
@@ -36,88 +41,14 @@
 - Remove encapsulate helper.
 - Add support for menu inheritance.
 - Emphasize source column labels.
-- Backport file cache manager app.
-- Convert document image cache to use file cache manager app.
-  Add setting DOCUMENTS_CACHE_MAXIMUM_SIZE defaults to 500 MB.
-- Replace djcelery and replace it with django-celery-beat.
-- Update Celery to version 4.3.0
-  Thanks to Jakob Haufe (@sur5r) and Jesaja Everling (@jeverling)
-  for much of the research and code updates.
-- Support wildcard MIME type associations for the file metadata drivers.
-- Rename MAYAN_GUID to MAYAN_GID
-- Update Gunicorn to use sync workers.
-- Include devpi-server as a development dependency.
-- Update default Docker stack file.
-- Remove Redis from the Docker image.
-- Add Celery flower to the Docker image.
-- Allow PIP proxying to the Docker image during build.
-- Default Celery worker concurrency to 0 (auto).
-- Set DJANGO_SETTINGS_MODULE environment variable to make it
-  available to sub processes.
-- Add entrypoint commands to run single workers, single gunicorn
-  or single celery commands like "flower".
-- Add platform template to return queues for a worker.
-- Update the EXIFTOOL driver to run for all documents
-  regardless of MIME type.
-- Remove task inspection from task manager app.
-- Move pagination navigation inside the toolbar.
-- Remove document image clear link and view.
-  This is now handled by the file caching app.
-- Add web links app.
-- Add support to display column help text
-  as a tooltip.
-- Update numeric dashboard widget to display
-  thousand commas.
-- Add support for disabling document pages.
-- Add support for converter layers.
-- Add redactions app.
-- Unify all line endings to be Linux style.
-- Add support for changing the system messages position.
-  GitLab issue #640. Thanks to Matthias Urhahn (@d4rken).
-
-3.2.7 (2019-08-28)
-==================
-- Fix checkout form bug. Thanks to Lucius Schaerer
-  (@lschaer1) for the report.
-- Disable pagination current page button
-  Current page button was clickable and would cause the
-  single page navigation to jump to the home view.
-- Remove redundant Celery queue declarations from the
-  file_metadata app.
-- Add internal_name field to workflow serializer.
-  Fixes workflow API creation view.
-- Fix document cabinet list API view. Thanks for forum user
-  "jere" for the report. Forum topic 1039.
-- Fix document template column field. GitLab issue #655.
-  Thanks to Christian Wiegand (@christianwgd) for the
-  report.
-- Increase mailing profile password field max length
-  from 48 to 128 characters. GitLab issue #657.
-  Thanks to sigsec (@sigsec) for the report.
-- Update the Docker entrypoint to update the ownership
-  of files when the UID of GUID are changed.
-  GitLab issue #650. Thanks to Fabian (@ruffy91)
-  for the report.
-- Update the Docker entrypoint to allow changing
-  the GID of the mayan user to existing values.
-  GitLab issue #652. Thanks to Fabian (@ruffy91)
-  for the report.
-- Rename the MAYAN_USER_GUID environment variable
-  to MAYAN_USER_GID.
-* Add automatic adjustment of HTML body on navigation
-  bar changes. Closes GitLab issue #643. Thanks to
-  Light Templar (@LightTemplar) for the report.
-* Unify all line endings to be Linux style.
-* Make sure system alerts don't appear under
-  floating elements.
 
 3.2.6 (2019-07-10)
 ==================
-- Remove the smart settings app * import.
-- Encode settings YAML before hashing.
-- Fix document icon used in the workflow runtime links.
-- Add trashed date time label.
-- Fix thumbnail generation issue. GitLab issue #637.
+* Remove the smart settings app * import.
+* Encode settings YAML before hashing.
+* Fix document icon used in the workflow runtime links.
+* Add trashed date time label.
+* Fix thumbnail generation issue. GitLab issue #637.
   Thanks to Giacomo Cariello (@giacomocariello) for the report
   and the merge request fixing the issue.
 
@@ -169,6 +100,8 @@
 ==================
 - Add support for disabling the random primary key
   test mixin.
+- Add a reusable task to upload documents.
+- Add MVP of the importer app.
 - Fix mailing profile log columns mappings.
   GitLab issue #626. Thanks to Jesaja Everling (@jeverling)
   for the report.

Makefile

@@ -18,7 +18,7 @@ clean-pyc: ## Remove Python artifacts.
 	find . -name '*.pyc' -exec rm -f {} +
 	find . -name '*.pyo' -exec rm -f {} +
 	find . -name '*~' -exec rm -f {} +
-	find . -name '__pycache__' -exec rm -R -f {} + 
+
 
 # Testing
 
@@ -234,10 +234,10 @@ generate-requirements: ## Generate all requirements files from the project deped
 # Dev server
 
 runserver: ## Run the development server.
-	./manage.py runserver --nothreading --settings=mayan.settings.development $(ADDRPORT)
+	./manage.py runserver --settings=mayan.settings.development $(ADDRPORT)
 
 runserver_plus: ## Run the Django extension's development server.
-	./manage.py runserver_plus --nothreading --settings=mayan.settings.development $(ADDRPORT)
+	./manage.py runserver_plus --settings=mayan.settings.development $(ADDRPORT)
 
 shell_plus: ## Run the shell_plus command.
 	./manage.py shell_plus --settings=mayan.settings.development
@@ -258,7 +258,7 @@ test-with-docker-frontend: ## Launch a front end instance that uses the producti
 	./manage.py runserver --settings=mayan.settings.staging.docker
 
 test-with-docker-worker: ## Launch a worker instance that uses the production-like services.
-	DJANGO_SETTINGS_MODULE=mayan.settings.staging.docker ./manage.py celery worker -A mayan -B -l INFO -O fair
+	./manage.py celery worker --settings=mayan.settings.staging.docker -B -l INFO -O fair
 
 docker-mysql-on: ## Launch and initialize a MySQL Docker container.
 	docker run -d --name mysql -p 3306:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=True -e MYSQL_DATABASE=mayan_edms mysql

README.md

@@ -1,11 +1,11 @@
-[![Donation](https://img.shields.io/badge/donation-PayPal-brightgreen)](https://paypal.me/MayanEDMS)
 [![pypi][pypi]][pypi-url]
 [![builds][builds]][builds-url]
+[![coverage][cover]][cover-url]
 ![python][python]
 ![license][license]
 [![Docker pulls](https://img.shields.io/docker/pulls/mayanedms/mayanedms.svg?maxAge=3600)](https://hub.docker.com/r/mayanedms/mayanedms/)
 [![Docker Stars](https://img.shields.io/docker/stars/mayanedms/mayanedms.svg?maxAge=3600)](https://hub.docker.com/r/mayanedms/mayanedms/)
-
+[![Docker layers](https://images.microbadger.com/badges/image/mayanedms/mayanedms.svg)](https://microbadger.com/images/mayanedms/mayanedms)
 
 [pypi]: http://img.shields.io/pypi/v/mayan-edms.svg
 [pypi-url]: http://badge.fury.io/py/mayan-edms
@@ -43,20 +43,6 @@
 
 </div>
 
-<h2 align="center">Book</h2>
-
-The pre-release version of the book "Exploring Mayan EDMS" available now at a discounted price!
-
-<p align="center">
-    <a href="https://sellfy.com/p/um2fkx/">
-        <img width="400" src="https://d12swbtw719y4s.cloudfront.net/images/v6RpxW40/aP0qKLjkPiAuXZhYuB45/wDAULAzFyx.jpeg?w=548">
-    </a>
-</p>
-
-Limited quantities. Buyers of the pre-release will get the full version for free when it is ready.
-
-The link is https://sellfy.com/p/um2fkx/
-
 <h2 align="center">Installation</h2>
 
 The easiest way to use Mayan EDMS is by using the official

README.rst

@@ -1,4 +1,4 @@
-|donation| |pypi| |builds| |coverage| |python| |license| |docker_pulls| |docker_stars| |docker_layers|
+|pypi| |builds| |coverage| |python| |license| |docker_pulls| |docker_stars| |docker_layers|
 
 
 .. image:: https://gitlab.com/mayan-edms/mayan-edms/raw/master/docs/_static/mayan_logo.png
@@ -25,16 +25,6 @@ at: https://docs.mayan-edms.com/topics/installation.html
 
 .. _Docker: https://www.docker.com/
 
-The pre-release version of the book "Exploring Mayan EDMS" available now at a discounted price!
-
-.. image:: https://camo.githubusercontent.com/89d2fe787507c9247aa7bb406e2682b53eb7a5f9/68747470733a2f2f64313273776274773731397934732e636c6f756466726f6e742e6e65742f696d616765732f76365270785734302f615030714b4c6a6b50694175585a6859754234352f774441554c417a4679782e6a7065673f773d353438
-    :align: center
-    :width: 300
-    :target: https://sellfy.com/p/um2fkx/
-
-Limited quantities. Buyers of the pre-release will get the full version for free when it is ready.
-Click the image or visit: https://sellfy.com/p/um2fkx/
-
 Hardware requirements
 
 - 2 Gigabytes of RAM (1 Gigabyte if OCR is turned off).
@@ -54,8 +44,6 @@ Important links
 - `Videos <https://www.youtube.com/channel/UCJOOXHP1MJ9lVA7d8ZTlHPw>`__
 
 
-.. |donation| image:: https://img.shields.io/badge/donation-PayPal-brightgreen
-   :target: https://paypal.me/MayanEDMS
 .. |pypi| image:: http://img.shields.io/pypi/v/mayan-edms.svg
    :target: http://badge.fury.io/py/mayan-edms
 .. |builds| image:: https://gitlab.com/mayan-edms/mayan-edms/badges/master/build.svg

contrib/scripts/process_messages.py

@@ -13,12 +13,11 @@ APP_LIST = (
     'checkouts', 'common', 'converter', 'dashboards', 'dependencies',
     'django_gpg', 'document_comments', 'document_indexing',
     'document_parsing', 'document_signatures', 'document_states',
-    'documents', 'dynamic_search', 'events', 'file_caching',
-    'file_metadata', 'linking', 'lock_manager', 'mailer',
-    'mayan_statistics', 'metadata', 'mirroring', 'motd', 'navigation',
-    'ocr', 'permissions', 'platform', 'rest_api', 'smart_settings',
-    'sources', 'storage', 'tags', 'task_manager', 'user_management',
-    'weblinks'
+    'documents', 'dynamic_search', 'events', 'file_metadata', 'linking',
+    'lock_manager', 'mailer', 'mayan_statistics', 'metadata', 'mirroring',
+    'motd', 'navigation', 'ocr', 'permissions', 'platform', 'rest_api',
+    'smart_settings', 'sources', 'storage', 'tags', 'task_manager',
+    'user_management'
 )
 
 LANGUAGE_LIST = (

docker/Dockerfile

@@ -4,7 +4,7 @@
 # BASE_IMAGE - Bare bones image with the base packages needed to run Mayan EDMS
 ####
 
-FROM debian:10.0-slim as BASE_IMAGE
+FROM debian:9.8-slim as BASE_IMAGE
 
 LABEL maintainer="Roberto Rosario roberto.rosario@mayan-edms.com"
 
@@ -22,7 +22,6 @@ RUN set -x \
 && DEBIAN_FRONTEND=noninteractive \
 apt-get update \
 && apt-get install -y --no-install-recommends \
-    ca-certificates \
     exiftool \
     ghostscript \
     gpgv \
@@ -30,11 +29,11 @@ apt-get update \
     graphviz \
     libfuse2 \
     libmagic1 \
-    libmariadb3 \
+    libmariadbclient18 \
     libreoffice \
     libpq5 \
     poppler-utils \
-    python3-distutils \
+    redis-server \
     sane-utils \
     sudo \
     supervisor \
@@ -53,20 +52,22 @@ apt-get update \
 && if [ "$(uname -m)" = "armv7l" ]; then \
     ln -s /usr/lib/arm-linux-gnueabihf/libz.so /usr/lib/ \
     && ln -s /usr/lib/arm-linux-gnueabihf/libjpeg.so /usr/lib/ \
-; fi
+; fi \
+# Discard data when Redis runs out of memory
+&& echo "maxmemory-policy allkeys-lru" >> /etc/redis/redis.conf \
+# Disable saving the Redis database
+echo "save \"\"" >> /etc/redis/redis.conf \
+# Only provision 1 database
+&& echo "databases 1" >> /etc/redis/redis.conf
+
 
 ####
-# BUILDER_IMAGE - This image builds the Python package and is discarded afterwards
-#                 only the build artifact is carried over to the next image.
+# BUILDER_IMAGE - This image buildS the Python package and is discarded afterwards
 ####
 
 # Reuse image
 FROM BASE_IMAGE as BUILDER_IMAGE
 
-# Python libraries caching
-ARG PIP_INDEX_URL
-ARG PIP_TRUSTED_HOST
-
 WORKDIR /src
 
 # Copy the source files needed to build the Python package
@@ -95,32 +96,31 @@ apt-get install -y --no-install-recommends \
     libssl-dev \
     g++ \
     gcc \
-    python3-dev \
-    python3-venv \
+    python-dev \
+    python-virtualenv \
 && mkdir -p "${PROJECT_INSTALL_DIR}" \
 && chown -R mayan:mayan "${PROJECT_INSTALL_DIR}" \
 && chown -R mayan:mayan /src
 
 USER mayan
-RUN python3 -m venv "${PROJECT_INSTALL_DIR}" \
+RUN python -m virtualenv "${PROJECT_INSTALL_DIR}" \
 && . "${PROJECT_INSTALL_DIR}/bin/activate" \
-&& pip install --no-cache-dir \
-    librabbitmq==2.0.0 \
-    mysqlclient==1.4.2.post1 \
-    psycopg2==2.8.3 \
-    redis==3.2.1 \
-    flower==0.9.3 \
+&& pip install --no-cache-dir --no-use-pep517 \
+    librabbitmq==1.6.1 \
+    mysql-python==1.2.5 \
+    psycopg2==2.7.3.2 \
+    redis==2.10.6 \
 # psutil is needed by ARM builds otherwise gevent and gunicorn fail to start
 && UNAME=`uname -m` && if [ "${UNAME#*arm}" != $UNAME ]; then \
-    pip install --no-cache-dir \
+    pip install --no-cache-dir --no-use-pep517 \
     psutil==5.6.2 \
 ; fi \
 # Install the Python packages needed to build Mayan EDMS
-&& pip install --no-cache-dir -r /src/requirements/build.txt \
+&& pip install --no-cache-dir --no-use-pep517 -r /src/requirements/build.txt \
 # Build Mayan EDMS
-&& python3 setup.py sdist \
+&& python setup.py sdist \
 # Install the built Mayan EDMS package
-&& pip install --no-cache-dir dist/mayan* \
+&& pip install --no-cache-dir --no-use-pep517 dist/mayan* \
 # Install the static content
 && mayan-edms.py installdependencies \
 && MAYAN_STATIC_ROOT=${PROJECT_INSTALL_DIR}/static mayan-edms.py preparestatic --link --noinput
@@ -128,7 +128,7 @@ RUN python3 -m venv "${PROJECT_INSTALL_DIR}" \
 COPY --chown=mayan:mayan requirements/testing-base.txt "${PROJECT_INSTALL_DIR}"
 
 ####
-# Final image - BASE_IMAGE + BUILDER_IMAGE artifact (Mayan install directory)
+# Final image - BASE_IMAGE + Mayan install directory from the builder image
 ####
 
 FROM BASE_IMAGE
@@ -144,7 +144,7 @@ VOLUME ["/var/lib/mayan"]
 ENTRYPOINT ["entrypoint.sh"]
 
 EXPOSE 8000
-CMD ["run_all"]
+CMD ["mayan"]
 
 RUN ${PROJECT_INSTALL_DIR}/bin/mayan-edms.py platformtemplate supervisord_docker > /etc/supervisor/conf.d/mayan.conf \
 && apt-get clean autoclean \

docker/Makefile

@@ -1,9 +1,4 @@
-HOST_IP = `/sbin/ip route|awk '/docker0/ { print $$9 }'`
-
-APT_PROXY ?= $(HOST_IP):3142
-PIP_INDEX_URL ?= http://$(HOST_IP):3141/root/pypi/+simple/
-PIP_TRUSTED_HOST ?= $(HOST_IP)
-
+APT_PROXY ?= `/sbin/ip route|awk '/docker0/ { print $$9 }'`:3142
 IMAGE_VERSION ?= `cat docker/rootfs/version`
 CONSOLE_COLUMNS ?= `echo $$(tput cols)`
 CONSOLE_LINES ?= `echo $$(tput lines)`
@@ -12,7 +7,7 @@ docker-build: ## Build a new image locally.
 	docker build -t mayanedms/mayanedms:$(IMAGE_VERSION) -f docker/Dockerfile .
 
 docker-build-with-proxy: ## Build a new image locally using an APT proxy as APT_PROXY.
-	docker build -t mayanedms/mayanedms:$(IMAGE_VERSION) -f docker/Dockerfile --build-arg APT_PROXY=$(APT_PROXY) --build-arg PIP_INDEX_URL=$(PIP_INDEX_URL) --build-arg PIP_TRUSTED_HOST=$(PIP_TRUSTED_HOST) --build-arg HTTP_PROXY=$(HTTP_PROXY) --build-arg HTTPS_PROXY=$(HTTPS_PROXY) .
+	docker build -t mayanedms/mayanedms:$(IMAGE_VERSION) -f docker/Dockerfile --build-arg APT_PROXY=$(APT_PROXY) .
 
 docker-shell: ## Launch a bash instance inside a running container. Pass the container name via DOCKER_CONTAINER.
 	docker exec -e TERM=$(TERM) -e "COLUMNS=$(CONSOLE_COLUMNS)" -e "LINES=$(CONSOLE_LINES)" -it $(DOCKER_CONTAINER) /bin/bash
@@ -28,13 +23,3 @@ docker-test-cleanup: ## Delete the test container and the test volume.
 docker-test-all: ## Build and executed the test suite in a test container.
 docker-test-all: docker-build-with-proxy
 	docker run --rm run-tests
-
-docker-compose-build:
-	docker-compose -f docker/docker-compose.yml -p mayan-edms build
-
-docker-compose-build-with-proxy:
-	docker-compose -f docker/docker-compose.yml -p mayan-edms build --build-arg APT_PROXY=$(APT_PROXY) --build-arg PIP_INDEX_URL=$(PIP_INDEX_URL) --build-arg PIP_TRUSTED_HOST=$(PIP_TRUSTED_HOST) --build-arg HTTP_PROXY=$(HTTP_PROXY) --build-arg HTTPS_PROXY=$(HTTPS_PROXY)
-
-docker-compose-up:
-	docker-compose -f docker/docker-compose.yml -p mayan-edms up
-

docker/docker-compose-development.yml

@@ -0,0 +1,72 @@
+version: '2.1'
+
+volumes:
+    broker:
+        driver: local
+    app:
+        driver: local
+    db:
+        driver: local
+    results:
+        driver: local
+
+services:
+  broker:
+    container_name: mayan-edms-broker
+    image: healthcheck/rabbitmq
+    environment:
+      RABBITMQ_DEFAULT_USER: mayan
+      RABBITMQ_DEFAULT_PASS: mayan
+      RABBITMQ_DEFAULT_VHOST: mayan
+    volumes:
+      - broker:/var/lib/rabbitmq
+  results:
+    container_name: mayan-edms-results
+    image: healthcheck/redis
+    volumes:
+      - results:/data
+  #db:
+  #  container_name: mayan-edms-db
+  #  image: healthcheck/mysql
+  #  environment:
+  #    MYSQL_DATABASE: mayan
+  #    MYSQL_PASSWORD: mayan-password
+  #    MYSQL_ROOT_PASSWORD: root-password
+  #    MYSQL_USER: mayan
+  #  volumes:
+  #    - db:/var/lib/mysql
+  db:
+    container_name: mayan-edms-db
+    image: healthcheck/postgres
+    environment:
+      POSTGRES_DB: mayan
+      POSTGRES_PASSWORD: mayan-password
+      POSTGRES_USER: mayan
+    volumes:
+      - db:/var/lib/postgresql/data
+  mayan-edms:
+    container_name: mayan-edms-app
+    image: mayan-edms/next
+    build:
+      context: ./
+      args:
+        - APT_PROXY=172.18.0.1:3142
+    depends_on:
+      broker:
+        condition: service_healthy
+      db:
+        condition: service_healthy
+      results:
+        condition: service_healthy
+    environment:
+      MAYAN_BROKER_URL: amqp://mayan:mayan@broker:5672/mayan
+      MAYAN_CELERY_RESULT_BACKEND: redis://results:6379/0
+      MAYAN_DATABASE_ENGINE: django.db.backends.postgresql
+      MAYAN_DATABASE_HOST: db
+      MAYAN_DATABASE_NAME: mayan
+      MAYAN_DATABASE_PASSWORD: mayan-password
+      MAYAN_DATABASE_USER: mayan
+    ports:
+      - "80:80"
+    volumes:
+      - app:/var/lib/mayan

docker/docker-compose.yml

@@ -1,130 +1,58 @@
-version: '3.7'
+version: '2.1'
 
-networks:
-  mayan-bridge:
-    driver: bridge
+volumes:
+    broker:
+        driver: local
+    app:
+        driver: local
+    db:
+        driver: local
+    results:
+        driver: local
 
 services:
-  app:
-    build:
-      context: ..
-      dockerfile: ./docker/Dockerfile
-    depends_on:
-      - postgresql
-      - redis
-      # Enable to use RabbitMQ
-      #- rabbitmq
-    environment: &mayan_env
-      # Enable to use RabbitMQ
-      # MAYAN_CELERY_BROKER_URL: amqp://mayan:mayanrabbitpass@broker:5672/mayan
-      # Disable Redis Broker to use RabbitMQ as Broker
-      MAYAN_CELERY_BROKER_URL: redis://redis:6379/1
-      MAYAN_CELERY_RESULT_BACKEND: redis://redis:6379/0
-      MAYAN_DATABASES: "{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayandbpass','USER':'mayan','HOST':'postgresql'}}"
-    image: mayanedms/mayanedms:3.2.6
-    networks:
-      - mayan-bridge
-    ports:
-      - "80:8000"
-    restart: unless-stopped
+  broker:
+    container_name: mayan-edms-broker
+    image: healthcheck/rabbitmq
+    environment:
+      RABBITMQ_DEFAULT_USER: mayan
+      RABBITMQ_DEFAULT_PASS: mayan
+      RABBITMQ_DEFAULT_VHOST: mayan
     volumes:
-      - /docker-volumes/mayan-edms/media:/var/lib/mayan
-
-  postgresql:
+      - broker:/var/lib/rabbitmq
+  results:
+    container_name: mayan-edms-results
+    image: healthcheck/redis
+    volumes:
+      - results:/data
+  db:
+    container_name: mayan-edms-db
+    image: healthcheck/postgres
     environment:
       POSTGRES_DB: mayan
-      POSTGRES_PASSWORD: mayandbpass
+      POSTGRES_PASSWORD: mayan-password
       POSTGRES_USER: mayan
-    image: postgres:9.6
-    networks:
-      - mayan-bridge
-    restart: unless-stopped
     volumes:
-      - /docker-volumes/mayan-edms/postgres:/var/lib/postgresql/data
-
-  redis:
-    command:
-      - redis-server
-      - --databases
-      - "2"
-      - --maxmemory-policy
-      - allkeys-lru
-      - --save
-      - ""
-    image: redis:5.0
-    networks:
-      - mayan-bridge
-    restart: unless-stopped
-
-  # Optional services
-
-  # celery_flower:
-  #   command:
-  #     - run_celery
-  #     - flower
-  #   depends_on:
-  #     - postgresql
-  #     - redis
-  #     # Enable to use RabbitMQ
-  #     # - rabbitmq
-  #   environment:
-  #     <<: *mayan_env
-  #   image: mayanedms/mayanedms:3.2.6
-  #   networks:
-  #     - mayan-bridge
-  #   ports:
-  #     - "5555:5555"
-  #   restart: unless-stopped
-
-  # Enable to use RabbitMQ
-  # rabbitmq:
-  #   container_name: mayan-edms-rabbitmq
-  #   image: healthcheck/rabbitmq
-  #   environment:
-  #     RABBITMQ_DEFAULT_USER: mayan
-  #     RABBITMQ_DEFAULT_PASS: mayanrabbitpass
-  #     RABBITMQ_DEFAULT_VHOST: mayan
-  #   networks:
-  #     - mayan-bridge
-  #   restart: unless-stopped
-  #   volumes:
-  #     - /docker-volumes/mayan-edms/rabbitmq:/var/lib/rabbitmq
-
-  # Enable to run stand alone workers
-  # worker_fast:
-  #   command:
-  #     - run_worker
-  #     - fast
-  #   depends_on:
-  #     - postgresql
-  #     - redis
-  #     # Enable to use RabbitMQ
-  #     # - rabbitmq
-  #   environment:
-  #     <<: *mayan_env
-  #   image: mayanedms/mayanedms:3.2.6
-  #   networks:
-  #     - mayan-bridge
-  #   restart: unless-stopped
-  #   volumes:
-  #     - /docker-volumes/mayan-edms/media:/var/lib/mayan
-
-  # Enable to run stand frontend gunicorn
-  # frontend:
-  #   command:
-  #     - run_frontend
-  #   depends_on:
-  #     - postgresql
-  #     - redis
-  #     # Enable to use RabbitMQ
-  #     # - rabbitmq
-  #   environment:
-  #     <<: *mayan_env
-  #   image: mayanedms/mayanedms:3.2.6
-  #   networks:
-  #     - mayan-bridge
-  #   ports:
-  #     - "81:8000"
-  #   restart: unless-stopped
-  #   volumes:
-  #     - /docker-volumes/mayan-edms/media:/var/lib/mayan
+      - db:/var/lib/postgresql/data
+  mayan-edms:
+    container_name: mayan-edms-app
+    image: mayanedms/mayanedms:latest
+    depends_on:
+      broker:
+        condition: service_healthy
+      db:
+        condition: service_healthy
+      results:
+        condition: service_healthy
+    environment:
+      MAYAN_BROKER_URL: amqp://mayan:mayan@broker:5672/mayan
+      MAYAN_CELERY_RESULT_BACKEND: redis://results:6379/0
+      MAYAN_DATABASE_ENGINE: django.db.backends.postgresql
+      MAYAN_DATABASE_HOST: db
+      MAYAN_DATABASE_NAME: mayan
+      MAYAN_DATABASE_PASSWORD: mayan-password
+      MAYAN_DATABASE_USER: mayan
+    ports:
+      - "80:8000"
+    volumes:
+      - app:/var/lib/mayan

docker/rootfs/usr/local/bin/entrypoint.sh

@@ -1,7 +1,4 @@
-#!/bin/bash
-
-# Use bash and not sh to support argument slicing "${@:2}"
-# sh defaults to dash instead of bash.
+#!/bin/sh
 
 set -e
 echo "mayan: starting entrypoint.sh"
@@ -9,18 +6,19 @@ INSTALL_FLAG=/var/lib/mayan/system/SECRET_KEY
 CONCURRENCY_ARGUMENT=--concurrency=
 
 DEFAULT_USER_UID=1000
-DEFAULT_USER_GID=1000
+DEFAULT_USER_GUID=1000
 
-MAYAN_USER_UID=${MAYAN_USER_UID:-${DEFAULT_USER_UID}}
-MAYAN_USER_GID=${MAYAN_USER_GID:-${DEFAULT_USER_GID}}
+export MAYAN_DEFAULT_BROKER_URL=redis://127.0.0.1:6379/0
+export MAYAN_DEFAULT_CELERY_RESULT_BACKEND=redis://127.0.0.1:6379/0
 
 export MAYAN_ALLOWED_HOSTS='["*"]'
 export MAYAN_BIN=/opt/mayan-edms/bin/mayan-edms.py
+export MAYAN_BROKER_URL=${MAYAN_BROKER_URL:-${MAYAN_DEFAULT_BROKER_URL}}
+export MAYAN_CELERY_RESULT_BACKEND=${MAYAN_CELERY_RESULT_BACKEND:-${MAYAN_DEFAULT_CELERY_RESULT_BACKEND}}
 export MAYAN_INSTALL_DIR=/opt/mayan-edms
 export MAYAN_PYTHON_BIN_DIR=/opt/mayan-edms/bin/
 export MAYAN_MEDIA_ROOT=/var/lib/mayan
 export MAYAN_SETTINGS_MODULE=${MAYAN_SETTINGS_MODULE:-mayan.settings.production}
-export DJANGO_SETTINGS_MODULE=${MAYAN_SETTINGS_MODULE}
 
 export MAYAN_GUNICORN_BIN=${MAYAN_PYTHON_BIN_DIR}gunicorn
 export MAYAN_GUNICORN_WORKERS=${MAYAN_GUNICORN_WORKERS:-2}
@@ -28,22 +26,13 @@ export MAYAN_GUNICORN_TIMEOUT=${MAYAN_GUNICORN_TIMEOUT:-120}
 export MAYAN_PIP_BIN=${MAYAN_PYTHON_BIN_DIR}pip
 export MAYAN_STATIC_ROOT=${MAYAN_INSTALL_DIR}/static
 
-MAYAN_WORKER_FAST_CONCURRENCY=${MAYAN_WORKER_FAST_CONCURRENCY:-0}
-MAYAN_WORKER_MEDIUM_CONCURRENCY=${MAYAN_WORKER_MEDIUM_CONCURRENCY:-0}
-MAYAN_WORKER_SLOW_CONCURRENCY=${MAYAN_WORKER_SLOW_CONCURRENCY:-0}
+MAYAN_WORKER_FAST_CONCURRENCY=${MAYAN_WORKER_FAST_CONCURRENCY:-1}
+MAYAN_WORKER_MEDIUM_CONCURRENCY=${MAYAN_WORKER_MEDIUM_CONCURRENCY:-1}
+MAYAN_WORKER_SLOW_CONCURRENCY=${MAYAN_WORKER_SLOW_CONCURRENCY:-1}
 
-update_uid_gid() {
-    echo "mayan: update_uid_gid()"
-    groupmod mayan -g ${MAYAN_USER_GID} 2>/dev/null || true
-    usermod mayan -u ${MAYAN_USER_UID} -g ${MAYAN_USER_GID} 2>/dev/null
-
-    if [ ${MAYAN_USER_UID} -ne ${DEFAULT_USER_UID} ] || [ ${MAYAN_USER_GID} -ne ${DEFAULT_USER_GID} ]; then
-        echo "mayan: Updating file ownership. This might take a while if there are many documents."
-        chown mayan:mayan ${MAYAN_INSTALL_DIR} ${MAYAN_STATIC_ROOT} ${MAYAN_MEDIA_ROOT}
-    fi
-}
-
-update_uid_gid
+echo "mayan: changing uid/guid"
+usermod mayan -u ${MAYAN_USER_UID:-${DEFAULT_USER_UID}}
+groupmod mayan -g ${MAYAN_USER_GUID:-${DEFAULT_USER_GUID}}
 
 if [ "$MAYAN_WORKER_FAST_CONCURRENCY" -eq 0 ]; then
     MAYAN_WORKER_FAST_CONCURRENCY=
@@ -66,9 +55,11 @@ else
 fi
 export MAYAN_WORKER_SLOW_CONCURRENCY
 
-# Allow importing of user setting modules
+export CELERY_ALWAYS_EAGER=False
 export PYTHONPATH=$PYTHONPATH:$MAYAN_MEDIA_ROOT
 
+chown mayan:mayan /var/lib/mayan -R
+
 apt_get_install() {
     apt-get -q update
     apt-get install -y --force-yes --no-install-recommends --auto-remove "$@"
@@ -76,9 +67,9 @@ apt_get_install() {
     rm -rf /var/lib/apt/lists/*
 }
 
-initialsetup() {
-    echo "mayan: initialsetup()"
-    su mayan -c "${MAYAN_BIN} initialsetup --force --no-dependencies"
+initialize() {
+    echo "mayan: initialize()"
+    su mayan -c "${MAYAN_BIN} initialsetup --force --no-javascript"
 }
 
 os_package_installs() {
@@ -95,71 +86,43 @@ pip_installs() {
     fi
 }
 
-run_all() {
+start() {
     echo "mayan: start()"
     rm -rf /var/run/supervisor.sock
     exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf
 }
 
-performupgrade() {
-    echo "mayan: performupgrade()"
-    su mayan -c "${MAYAN_BIN} performupgrade --no-dependencies"
-}
-
-make_ready() {
-    # Check if this is a new install, otherwise try to upgrade the existing
-    # installation on subsequent starts
-    if [ ! -f $INSTALL_FLAG ]; then
-        initialsetup
-    else
-        performupgrade
-    fi
-}
-
-set_uid_guid() {
-    echo "mayan: changing uid/guid"
-    usermod mayan -u ${MAYAN_USER_UID:-${DEFAULT_USER_UID}}
-    groupmod mayan -g ${MAYAN_USER_GID:-${DEFAULT_USER_GID}}
+upgrade() {
+    echo "mayan: upgrade()"
+    su mayan -c "${MAYAN_BIN} performupgrade --no-javascript"
 }
 
 os_package_installs || true
 pip_installs || true
-chown mayan:mayan /var/lib/mayan -R
 
 case "$1" in
 
-run_initialsetup)
-    initialsetup
-    ;;
+mayan) # Check if this is a new install, otherwise try to upgrade the existing
+       # installation on subsequent starts
+       if [ ! -f $INSTALL_FLAG ]; then
+           initialize
+       else
+           upgrade
+       fi
+       start
+       ;;
 
-run_performupgrade)
-    performupgrade
-    ;;
+run-tests) # Check if this is a new install, otherwise try to upgrade the existing
+           # installation on subsequent starts
+           if [ ! -f $INSTALL_FLAG ]; then
+               initialize
+           else
+               upgrade
+           fi
+           run-tests.sh
+           ;;
 
-run_all)
-    make_ready
-    run_all
-    ;;
-
-run_celery)
-    run_celery.sh "${@:2}"
-    ;;
-
-run_frontend)
-    run_frontend.sh
-    ;;
-
-run_tests)
-    make_ready
-    run_tests.sh
-    ;;
-
-run_worker)
-    run_worker.sh "${@:2}"
-    ;;
-
-*)
-    su mayan -c "$@"
-    ;;
+*) su mayan -c "$@";
+   ;;
 
 esac

docker/rootfs/usr/local/bin/run_celery.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# Use -A and not --app. Both are the same but behave differently
-# -A can be located before the command while --app cannot.
-su mayan -c "${MAYAN_PYTHON_BIN_DIR}celery -A mayan $@"

docker/rootfs/usr/local/bin/run_frontend.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-MAYAN_GUNICORN_MAX_REQUESTS=${MAYAN_GUNICORN_MAX_REQUESTS:-500}
-MAYAN_GUNICORN_MAX_REQUESTS_JITTERS=${MAYAN_GUNICORN_MAX_REQUESTS_JITTERS:-50}
-MAYAN_GUNICORN_WORKER_CLASS=${MAYAN_GUNICORN_WORKER_CLASS:-sync}
-
-su mayan -c "${MAYAN_PYTHON_BIN_DIR}gunicorn -w ${MAYAN_GUNICORN_WORKERS} mayan.wsgi --max-requests ${MAYAN_GUNICORN_MAX_REQUESTS} --max-requests-jitter ${MAYAN_GUNICORN_MAX_REQUESTS_JITTERS} --worker-class ${MAYAN_GUNICORN_WORKER_CLASS} --bind 0.0.0.0:8000 --timeout ${MAYAN_GUNICORN_TIMEOUT}"

docker/rootfs/usr/local/bin/run_worker.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-QUEUE_LIST=`MAYAN_WORKER_NAME=$1 su mayan -c "${MAYAN_PYTHON_BIN_DIR}mayan-edms.py platformtemplate worker_queues"`
-
-# Use -A and not --app. Both are the same but behave differently
-# -A can be located before the command while --app cannot.
-# Pass ${@:2} to allow overriding the defaults arguments
-su mayan -c "${MAYAN_PYTHON_BIN_DIR}celery -A mayan worker -Ofair -l ERROR -Q $QUEUE_LIST ${@:2}"

docker/rootfs/version

@@ -1 +1 @@
-3.2.7
+3.2.6

docker/stack.yml

@@ -9,32 +9,24 @@ volumes:
 services:
 
   db:
+    image: postgres
     environment:
       POSTGRES_DB: mayan
-      POSTGRES_PASSWORD: mayandbpass
+      POSTGRES_PASSWORD: mayan-password
       POSTGRES_USER: mayan
-    image: postgres
     volumes:
       - db:/var/lib/postgresql/data
 
   app:
-    environment:
-      MAYAN_CELERY_BROKER_URL: redis://redis:6379/1
-      MAYAN_CELERY_RESULT_BACKEND: redis://redis:6379/0
-      MAYAN_DATABASES: "{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayandbpass','USER':'mayan','HOST':'db'}}"
     image: mayanedms/mayanedms:latest
     ports:
       - 80:8000
+    environment:
+      MAYAN_DATABASE_ENGINE: django.db.backends.postgresql
+      MAYAN_DATABASE_HOST: db
+      MAYAN_DATABASE_NAME: mayan
+      MAYAN_DATABASE_PASSWORD: mayan-password
+      MAYAN_DATABASE_USER: mayan
+      MAYAN_DATABASE_CONN_MAX_AGE: 0
     volumes:
       - app:/var/lib/mayan
-
-  redis:
-    command:
-      - redis-server
-      - --databases
-      - "2"
-      - --maxmemory-policy
-      - allkeys-lru
-      - --save
-      - ""
-    image: redis:5.0

docs/chapters/deploying.rst

@@ -220,11 +220,11 @@ of a restart or power failure. The Gunicorn workers are increased to 3.
 ---------------------------------------------------------------------
    Replace (paying attention to the comma at the end)::
 
-       MAYAN_CELERY_BROKER_URL="redis://127.0.0.1:6379/0",
+       MAYAN_BROKER_URL="redis://127.0.0.1:6379/0",
 
    with::
 
-       MAYAN_CELERY_BROKER_URL="amqp://mayan:mayanrabbitmqpassword@localhost:5672/mayan",
+       MAYAN_BROKER_URL="amqp://mayan:mayanrabbitmqpassword@localhost:5672/mayan",
 
    increase the number of Gunicorn workers to 3 in the line (``-w 2`` section)::
 

docs/chapters/docker.rst

@@ -49,7 +49,12 @@ Finally create and run a Mayan EDMS container::
     --name mayan-edms \
     --restart=always \
     -p 80:8000 \
-    -e MAYAN_DATABASES="{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayanuserpass','USER':'mayan','HOST':'172.17.0.1'}}" \
+    -e MAYAN_DATABASE_ENGINE=django.db.backends.postgresql \
+    -e MAYAN_DATABASE_HOST=172.17.0.1 \
+    -e MAYAN_DATABASE_NAME=mayan \
+    -e MAYAN_DATABASE_PASSWORD=mayanuserpass \
+    -e MAYAN_DATABASE_USER=mayan \
+    -e MAYAN_DATABASE_CONN_MAX_AGE=0 \
     -v /docker-volumes/mayan-edms/media:/var/lib/mayan \
     mayanedms/mayanedms:<version>
 
@@ -103,7 +108,12 @@ instead of the IP address of the Docker host (``172.17.0.1``)::
     --network=mayan \
     --restart=always \
     -p 80:8000 \
-    -e MAYAN_DATABASES="{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayanuserpass','USER':'mayan','HOST':'mayan-edms-postgres'}}" \
+    -e MAYAN_DATABASE_ENGINE=django.db.backends.postgresql \
+    -e MAYAN_DATABASE_HOST=mayan-edms-postgres \
+    -e MAYAN_DATABASE_NAME=mayan \
+    -e MAYAN_DATABASE_PASSWORD=mayanuserpass \
+    -e MAYAN_DATABASE_USER=mayan \
+    -e MAYAN_DATABASE_CONN_MAX_AGE=0 \
     -v /docker-volumes/mayan-edms/media:/var/lib/mayan \
     mayanedms/mayanedms:<version>
 
@@ -127,14 +137,102 @@ To start the container again::
 Environment Variables
 ---------------------
 
-The common set of settings can also be modified via environment variables when
-using the Docker image. In addition to the common set of settings, some Docker
-image specific environment variables are available.
+The Mayan EDMS image can be configure via environment variables.
+
+``MAYAN_DATABASE_ENGINE``
+
+Defaults to ``None``. This environment variable configures the database
+backend to use. If left unset, SQLite will be used. The database backends
+supported by this Docker image are:
+
+- ``'django.db.backends.postgresql'``
+- ``'django.db.backends.mysql'``
+- ``'django.db.backends.sqlite3'``
+
+When using the SQLite backend, the database file will be saved in the Docker
+volume. The SQLite database as used by Mayan EDMS is meant only for development
+or testing, never use it in production.
+
+``MAYAN_DATABASE_NAME``
+
+Defaults to 'mayan'. This optional environment variable can be used to define
+the database name that Mayan EDMS will connect to. For more information read
+the pertinent Django documentation page:
+:django-docs:`Connecting to the database <ref/databases/#connecting-to-the-database>`
+
+``MAYAN_DATABASE_USER``
+
+Defaults to 'mayan'. This optional environment variable is used to set the
+username that will be used to connect to the database. For more information
+read the pertinent Django documentation page:
+:django-docs:`Settings, USER <ref/settings/#user>`
+
+``MAYAN_DATABASE_PASSWORD``
+
+Defaults to ''. This optional environment variable is used to set the
+password that will be used to connect to the database. For more information
+read the pertinent Django documentation page:
+:django-docs:`Settings, PASSWORD <ref/settings/#password>`
+
+``MAYAN_DATABASE_HOST``
+
+Defaults to `None`. This optional environment variable is used to set the
+hostname that will be used to connect to the database. This can be the
+hostname of another container or an IP address. For more information read
+the pertinent Django documentation page:
+:django-docs:`Settings, HOST <ref/settings/#host>`
+
+``MAYAN_DATABASE_PORT``
+
+Defaults to `None`. This optional environment variable is used to set the
+port number to use when connecting to the database. An empty string means
+the default port. Not used with SQLite. For more information read the
+pertinent Django documentation page:
+:django-docs:`Settings, PORT <ref/settings/#port>`
+
+``MAYAN_BROKER_URL``
+
+This optional environment variable determines the broker that Celery will use
+to relay task messages between the frontend code and the background workers.
+For more information read the pertinent Celery Kombu documentation page: `Broker URL`_
+
+.. _Broker URL: http://kombu.readthedocs.io/en/latest/userguide/connections.html#connection-urls
+
+This Docker image supports using Redis and RabbitMQ as brokers.
+
+Caveat: If the `MAYAN_BROKER_URL` and `MAYAN_CELERY_RESULT_BACKEND` environment
+variables are specified, the built-in Redis server inside the container will
+be disabled.
+
+``MAYAN_CELERY_RESULT_BACKEND``
+
+This optional environment variable determines the results backend that Celery
+will use to relay result messages from the background workers to the frontend
+code. For more information read the pertinent Celery Kombu documentation page:
+`Task result backend settings`_
+
+.. _Task result backend settings: http://docs.celeryproject.org/en/3.1/configuration.html#celery-result-backend
+
+This Docker image supports using Redis and RabbitMQ as result backends.
+
+Caveat: If the `MAYAN_BROKER_URL` and `MAYAN_CELERY_RESULT_BACKEND` environment
+variables are specified, the built-in Redis server inside the container will
+be disabled.
 
 ``MAYAN_SETTINGS_MODULE``
 
 Optional. Allows loading an alternate settings file.
 
+``MAYAN_DATABASE_CONN_MAX_AGE``
+
+Amount in seconds to keep a database connection alive. Allow reuse of database
+connections. For more information read the pertinent Django documentation
+page: :django-docs:`Settings, CONN_MAX_AGE <ref/settings/#conn-max-age>`
+According to new information Gunicorn's microthreads don't share connections
+and will exhaust the available Postgres connections available if a number
+other than 0 is used. Reference: https://serverfault.com/questions/635100/django-conn-max-age-persists-connections-but-doesnt-reuse-them-with-postgresq
+and https://github.com/benoitc/gunicorn/issues/996
+
 ``MAYAN_GUNICORN_WORKERS``
 
 Optional. This environment variable controls the number of frontend workers
@@ -171,21 +269,12 @@ number of CPUs detected).
 Optional. Changes the UID of the ``mayan`` user internal to the Docker
 container. Defaults to 1000.
 
-``MAYAN_USER_GID``
+``MAYAN_USER_GUID``
 
-Optional. Changes the GID of the ``mayan`` user internal to the Docker
+Optional. Changes the GUID of the ``mayan`` user internal to the Docker
 container. Defaults to 1000.
 
 
-Included drivers
-----------------
-
-The Docker image supports using Redis and RabbitMQ as result backends. For
-databases, the image includes support for PostgreSQL and MySQL/MariaDB.
-Support for additional brokers or databases may be added using the
-``MAYAN_APT_INSTALL`` environment variable.
-
-
 .. _docker-accessing-outside-data:
 
 Accessing outside data
@@ -353,7 +442,6 @@ These are:
 
 Nightly images
 ==============
-
 The continuous integration pipeline used for testing development builds also
 produces a resulting Docker image. These are build automatically and their
 stability is not guaranteed. They should never be used in production.

docs/chapters/scaling_up.rst

@@ -94,11 +94,11 @@ For the Docker image, launch a separate RabbitMQ container
 
     docker run -d --name mayan-edms-rabbitmq -e RABBITMQ_DEFAULT_USER=mayan -e RABBITMQ_DEFAULT_PASS=mayanrabbitmqpassword -e RABBITMQ_DEFAULT_VHOST=mayan rabbitmq:3
 
-Pass the MAYAN_CELERY_BROKER_URL environment variable (https://kombu.readthedocs.io/en/latest/userguide/connections.html#connection-urls)
+Pass the MAYAN_BROKER_URL environment variable (https://kombu.readthedocs.io/en/latest/userguide/connections.html#connection-urls)
 to the Mayan EDMS container so that it uses the RabbitMQ container the
 message broker::
 
-    -e MAYAN_CELERY_BROKER_URL="amqp://mayan:mayanrabbitmqpassword@localhost:5672/mayan",
+    -e MAYAN_BROKER_URL="amqp://mayan:mayanrabbitmqpassword@localhost:5672/mayan",
 
 When tasks finish, they leave behind a return status or the result of a
 calculation, these are stored for a while so that whoever requested the

docs/chapters/sources.rst

@@ -15,8 +15,7 @@ The current document sources supported are:
 - IMAP email - Same as the ``POP3`` email source but for email accounts using
   the ``IMAP`` protocol.
 - Watch folder - A filesystem folder that is scanned periodically for files.
-  Any file in the watch folder is automatically uploaded. When the upload for a
-  file is completed, the file is removed from source folder.
+  Any file in the watch folder is automatically uploaded.
 - Staging folder - Folder where networked attached scanned can save image
   files. The files in these staging folders are scanned and a preview is
   generated to help the process of upload. Staging folders and Watch folders

docs/conf.py

@@ -242,9 +242,6 @@ extlinks = {
             mayan.__django_version__
         ), 'Django documentation section: '
     ),
-    'forum-topic': (
-        'https://forum.mayan-edms.com/viewtopic.php?t=%s', 'Forum topic #'
-    ),
     'github-issue': (
         'https://github.com/mayan-edms/mayan-edms/issues/%s', 'GitHub issue #'
     ),

docs/releases/3.2.3.rst

@@ -19,7 +19,6 @@ Changes
   GitLab issue #625. Thanks to Jesaja Everling (@jeverling)
   for the report and the research.
 
-
 Removals
 --------
 

docs/releases/3.2.7.rst

@@ -1,145 +0,0 @@
-Version 3.2.7
-=============
-
-Released: August 28, 2019
-
-
-Changes
--------
-
-- Fix checkouts form bug. Fixes GitLab issue #654
-  Thanks to Lucius Schaerer (@lschaer1) for the report.
-- Disable pagination current page button
-  Current page button was clickable and would cause the
-  single page navigation to jump to the home view.
-- Remove redundant Celery queue declarations from the
-  file_metadata app.
-- Add internal_name field to workflow serializer.
-  Fixes workflow API creation view.
-- Fix document cabinet list API view. Thanks for forum user
-  "jere" for the report. Forum topic 1039.
-- Fix document template column field. GitLab issue #655.
-  Thanks to Christian Wiegand (@christianwgd) for the
-  report.
-- Increase mailing profile password field max length
-  from 48 to 128 characters. GitLab issue #657.
-  Thanks to sigsec (@sigsec) for the report.
-- Update the Docker entrypoint to update the ownership
-  of files when the UID of GUID are changed.
-  GitLab issue #650. Thanks to Fabian (@ruffy91)
-  for the report.
-- Update the Docker entrypoint to allow changing
-  the GID of the mayan user to existing values.
-  GitLab issue #652. Thanks to Fabian (@ruffy91)
-  for the report.
-- Rename the MAYAN_USER_GUID environment variable
-  to MAYAN_USER_GID.
-- Backport individual index rebuild support.
-- Add automatic adjustment of HTML body on navigation
-  bar changes. Closes GitLab issue #643. Thanks to
-  Light Templar (@LightTemplar) for the report.
-- Unify all line endings to be Linux style.
-- Make sure system alerts don't appear under
-  floating elements.
-
-Removals
---------
-
-- None
-
-
-Upgrading from a previous version
----------------------------------
-
-If installed via Python's PIP
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Remove deprecated requirements::
-
-    sudo -u mayan curl https://gitlab.com/mayan-edms/mayan-edms/raw/master/removals.txt -o /tmp/removals.txt && sudo -u mayan /opt/mayan-edms/bin/pip uninstall -y -r /tmp/removals.txt
-
-Type in the console::
-
-    sudo -u mayan /opt/mayan-edms/bin/pip install mayan-edms==3.2.7
-
-the requirements will also be updated automatically.
-
-
-Using Git
-^^^^^^^^^
-
-If you installed Mayan EDMS by cloning the Git repository issue the commands::
-
-    $ git reset --hard HEAD
-    $ git pull
-
-otherwise download the compressed archived and uncompress it overriding the
-existing installation.
-
-Remove deprecated requirements::
-
-    $ pip uninstall -y -r removals.txt
-
-Next upgrade/add the new requirements::
-
-    $ pip install --upgrade -r requirements.txt
-
-
-Common steps
-^^^^^^^^^^^^
-
-Perform these steps after updating the code from either step above.
-
-Make a backup of your supervisord file::
-
-    sudo cp /etc/supervisor/conf.d/mayan.conf /etc/supervisor/conf.d/mayan.conf.bck
-
-Update the supervisord configuration file. Replace the environment
-variables values show here with your respective settings. This step will refresh
-the supervisord configuration file with the new queues and the latest
-recommended layout::
-
-    sudo MAYAN_DATABASE_ENGINE=django.db.backends.postgresql MAYAN_DATABASE_NAME=mayan \
-    MAYAN_DATABASE_PASSWORD=mayanuserpass MAYAN_DATABASE_USER=mayan \
-    MAYAN_DATABASE_HOST=127.0.0.1 MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
-    /opt/mayan-edms/bin/mayan-edms.py platformtemplate supervisord > /etc/supervisor/conf.d/mayan.conf
-
-Edit the supervisord configuration file and update any setting the template
-generator missed::
-
-    sudo vi /etc/supervisor/conf.d/mayan.conf
-
-Migrate existing database schema with::
-
-    sudo -u mayan MAYAN_DATABASE_ENGINE=django.db.backends.postgresql MAYAN_DATABASE_NAME=mayan \
-    MAYAN_DATABASE_PASSWORD=mayanuserpass MAYAN_DATABASE_USER=mayan \
-    MAYAN_DATABASE_HOST=127.0.0.1 MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
-    /opt/mayan-edms/bin/mayan-edms.py performupgrade
-
-Add new static media::
-
-    sudo -u mayan MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
-    /opt/mayan-edms/bin/mayan-edms.py preparestatic --noinput
-
-The upgrade procedure is now complete.
-
-
-Backward incompatible changes
------------------------------
-
-- None
-
-
-Bugs fixed or issues closed
----------------------------
-
-- :gitlab-issue:`643` The "Actions" button won't show up, if window size between 992 and 1248 px
-- :gitlab-issue:`650` Permission denied when MAYAN_USER_UID and MAYAN_USER_GUID are set
-- :gitlab-issue:`652` MAYAN_USER_GUID cannot be set to specific values
-- :gitlab-issue:`654` Internal Server Error, Document Checkout
-- :gitlab-issue:`655` Index setup tree view shows two times the "enabled" field instead of "Link documents"
-- :gitlab-issue:`657` Mailer password length restriction is too short
-- :forum-topic:`1039` Re: /api/documents/{id}/cabinets returns 500
-- :forum-topic:`1050` edit/delete sub-cabinet
-
-.. _PyPI: https://pypi.python.org/pypi/mayan-edms/

docs/releases/3.3.rst

@@ -49,46 +49,6 @@ Changes
 - Remove encapsulate helper.
 - Add support for menu inheritance.
 - Emphasize source column labels.
-- Backport file cache manager app.
-- Convert document image cache to use file cache manager app.
-  Add setting DOCUMENTS_CACHE_MAXIMUM_SIZE defaults to 500 MB.
-- Update Celery to version 4.3.0. Settings changed:
-  MAYAN_BROKER_URL to MAYAN_CELERY_BROKER_URL,
-  MAYAN_CELERY_ALWAYS_EAGER to MAYAN_CELERY_TASK_ALWAYS_EAGER.
-- Replace djcelery and replace it with django-celery-beat.
-- Update Celery to version 4.3.0 with 55e9b2263cbdb9b449361412fd18d8ee0a442dd3
-  from versions/next, code from GitLab issue #594 and GitLab merge request !55.
-  Thanks to Jakob Haufe (@sur5r) and Jesaja Everling (@jeverling)
-  for much of the research and code updates.
-- Support wildcard MIME type associations for the file metadata drivers.
-- Rename MAYAN_GUID to MAYAN_GID
-- Update Gunicorn to use sync workers.
-- Include devpi-server as a development dependency.
-- Update default Docker stack file.
-- Remove Redis from the Docker image.
-- Add Celery flower to the Docker image.
-- Allow PIP proxying to the Docker image during build.
-- Default Celery worker concurrency to 0 (auto).
-- Set DJANGO_SETTINGS_MODULE environment variable to make it
-  available to sub processes.
-- Add entrypoint commands to run single workers, single gunicorn
-  or single celery commands like "flower".
-- Add platform template to return queues for a worker.
-- Remove task inspection from task manager app.
-- Move pagination navigation inside the toolbar.
-- Remove document image clear link and view.
-  This is now handled by the file caching app.
-- Add web links app.
-- Add support to display column help text
-  as a tooltip.
-- Update numeric dashboard widget to display
-  thousand commas.
-- Add support for disabling document pages.
-- Add support for converter layers.
-- Add redactions app.
-- Unify all line endings to be Linux style.
-- Add support for changing the system messages position.
-  GitLab issue #640. Thanks to Matthias Urhahn (@d4rken).
 
 Removals
 --------
@@ -96,17 +56,17 @@ Removals
 - Database conversion. Reason for removal. The database conversions support
   provided by this feature (SQLite to PostgreSQL) was being confused with
   database migrations and upgrades.
-
+  
   Database upgrades are the responsibility of the app and the framework.
   Database conversions however are not the responsibility of the app (Mayan),
   they are the responsibility of the framework.
-
+  
   Database conversion is outside the scope of what Mayan does but we added
   the code, management command, instructions and testing setup to provide
   this to our users until the framework (Django) decided to add this
   themselves (like they did with migrations).
 
-  Continued confusion about the purpose of the feature and confusion about
+  Continued confusion about the purpose of the feature and confusion about 
   how errors with this feature were a reflexion of the code quality of
   Mayannecessitated the removal of the database conversion feature.
 
@@ -200,14 +160,7 @@ Backward incompatible changes
 Bugs fixed or issues closed
 ---------------------------
 
-- :gitlab-issue:`526` RuntimeWarning: Never call result.get() within a task!
 - :gitlab-issue:`532` Workflow preview isn't updated right after transitions are modified
-- :gitlab-issue:`540` hint-outdated/update documentation
-- :gitlab-issue:`594` 3.2b1: Unable to install/run under Python 3.5/3.6/3.7
 - :gitlab-issue:`634` Failing docker entrypoint when using secret config
-- :gitlab-issue:`635` Build a docker image for Python3
-- :gitlab-issue:`640` UX: "Toast" Popup position prevents access to actions
-- :gitlab-issue:`644` Update sane-utils package in docker image.
-
 
 .. _PyPI: https://pypi.python.org/pypi/mayan-edms/

docs/releases/index.rst

@@ -21,7 +21,6 @@ versions of the documentation contain the release notes for any later releases.
    :maxdepth: 1
 
    3.3
-   3.2.7
    3.2.6
    3.2.5
    3.2.4

mayan/__init__.py

@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
 
 __title__ = 'Mayan EDMS'
-__version__ = '3.2.7'
-__build__ = 0x030207
-__build_string__ = 'v3.2.7_Wed Aug 28 17:31:08 2019 -0400'
+__version__ = '3.2.6'
+__build__ = 0x030206
+__build_string__ = 'v3.2.6_Wed Jul 10 03:18:15 2019 -0400'
 __django_version__ = '1.11'
 __author__ = 'Roberto Rosario'
 __author_email__ = 'roberto.rosario@mayan-edms.com'

mayan/apps/acls/classes.py

@@ -12,7 +12,6 @@ logger = logging.getLogger(__name__)
 class ModelPermission(object):
     _functions = {}
     _inheritances = {}
-    _manager_names = {}
     _registry = {}
 
     @classmethod
@@ -21,6 +20,22 @@ class ModelPermission(object):
         # TODO: Find method to revert the add_to_class('acls'...)
         # delattr doesn't work.
 
+    @classmethod
+    def register(cls, model, permissions):
+        from django.contrib.contenttypes.fields import GenericRelation
+
+        cls._registry.setdefault(model, [])
+        for permission in permissions:
+            cls._registry[model].append(permission)
+
+        AccessControlList = apps.get_model(
+            app_label='acls', model_name='AccessControlList'
+        )
+
+        model.add_to_class(
+            name='acls', value=GenericRelation(AccessControlList)
+        )
+
     @classmethod
     def get_classes(cls, as_content_type=False):
         ContentType = apps.get_model(
@@ -82,40 +97,6 @@ class ModelPermission(object):
     def get_inheritance(cls, model):
         return cls._inheritances[model]
 
-    @classmethod
-    def get_manager(cls, model):
-        try:
-            manager_name = cls.get_manager_name(model=model)
-        except KeyError:
-            manager_name = None
-
-        if manager_name:
-            manager = getattr(model, manager_name)
-        else:
-            manager = model._meta.default_manager
-
-        return manager
-
-    @classmethod
-    def get_manager_name(cls, model):
-        return cls._manager_names[model]
-
-    @classmethod
-    def register(cls, model, permissions):
-        from django.contrib.contenttypes.fields import GenericRelation
-
-        cls._registry.setdefault(model, [])
-        for permission in permissions:
-            cls._registry[model].append(permission)
-
-        AccessControlList = apps.get_model(
-            app_label='acls', model_name='AccessControlList'
-        )
-
-        model.add_to_class(
-            name='acls', value=GenericRelation(AccessControlList)
-        )
-
     @classmethod
     def register_function(cls, model, function):
         cls._functions[model] = function
@@ -123,7 +104,3 @@ class ModelPermission(object):
     @classmethod
     def register_inheritance(cls, model, related):
         cls._inheritances[model] = related
-
-    @classmethod
-    def register_manager(cls, model, manager_name):
-        cls._manager_names[model] = manager_name

mayan/apps/acls/locale/ar/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/ar/)\n"

mayan/apps/acls/locale/bg/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/language/bg/)\n"

mayan/apps/acls/locale/bs_BA/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/rosarior/mayan-edms/language/bs_BA/)\n"

mayan/apps/acls/locale/cs/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Czech (http://www.transifex.com/rosarior/mayan-edms/language/cs/)\n"

mayan/apps/acls/locale/da_DK/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (Denmark) (http://www.transifex.com/rosarior/mayan-edms/language/da_DK/)\n"

mayan/apps/acls/locale/de_DE/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-edms/language/de_DE/)\n"

mayan/apps/acls/locale/el/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Greek (http://www.transifex.com/rosarior/mayan-edms/language/el/)\n"

mayan/apps/acls/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

mayan/apps/acls/locale/es/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:51+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/language/es/)\n"

mayan/apps/acls/locale/fa/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/language/fa/)\n"

mayan/apps/acls/locale/fr/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/fr/)\n"

mayan/apps/acls/locale/hu/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/language/hu/)\n"

mayan/apps/acls/locale/id/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/language/id/)\n"

mayan/apps/acls/locale/it/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/language/it/)\n"

mayan/apps/acls/locale/lv/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-28 11:16+0000\n"
 "Last-Translator: Māris Teivāns <maris.teivans@gmail.com>\n"
 "Language-Team: Latvian (http://www.transifex.com/rosarior/mayan-edms/language/lv/)\n"

mayan/apps/acls/locale/nl_NL/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-edms/language/nl_NL/)\n"

mayan/apps/acls/locale/pl/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/pl/)\n"

mayan/apps/acls/locale/pt/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/language/pt/)\n"

mayan/apps/acls/locale/pt_BR/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-edms/language/pt_BR/)\n"

mayan/apps/acls/locale/ro_RO/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-18 15:35+0000\n"
 "Last-Translator: Harald Ersch\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-edms/language/ro_RO/)\n"

mayan/apps/acls/locale/ru/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/language/ru/)\n"

mayan/apps/acls/locale/sl_SI/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-edms/language/sl_SI/)\n"

mayan/apps/acls/locale/tr_TR/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/rosarior/mayan-edms/language/tr_TR/)\n"

mayan/apps/acls/locale/vi_VN/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/mayan-edms/language/vi_VN/)\n"

mayan/apps/acls/locale/zh/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (http://www.transifex.com/rosarior/mayan-edms/language/zh/)\n"

mayan/apps/acls/managers.py

@@ -45,8 +45,8 @@ class AccessControlListManager(models.Manager):
         # 4: No related field, but has an inherited related field, solved by
         # recursion, branches to #2 or #3.
         # 5: Inherited field of a related field
-        # 6: Inherited field of a related field that is Generic Foreign Key
         # -- Not addressed yet --
+        # 6: Inherited field of a related field that is Generic Foreign Key
         # 7: Has a related function
         result = []
 
@@ -58,28 +58,10 @@ class AccessControlListManager(models.Manager):
             if isinstance(related_field, GenericForeignKey):
                 # Case 3: Generic Foreign Key, multiple ContentTypes + object
                 # id combinations
-                # Also handles case #6 using the parent related field
-                # reference template.
-
-                # Craft a double underscore reference to a previous related
-                # field in the case where multiple related fields are
-                # associated.
-                # Example: object_layer__content_type
-                recuisive_related_reference = '__'.join(related_field_name.split('__')[0:-1])
-
-                # If there is at least one parent related field we add a
-                # double underscore to make it a valid filter template.
-                if recuisive_related_reference:
-                    recuisive_related_reference = '{}__'.format(recuisive_related_reference)
-
                 content_type_object_id_queryset = queryset.annotate(
                     ct_fk_combination=Concat(
-                        '{}{}'.format(
-                            recuisive_related_reference, related_field.ct_field
-                        ), Value('-'),
-                        '{}{}'.format(
-                            recuisive_related_reference, related_field.fk_field
-                        ), output_field=CharField()
+                        related_field.ct_field, Value('-'),
+                        related_field.fk_field, output_field=CharField()
                     )
                 ).values('ct_fk_combination')
 
@@ -93,7 +75,8 @@ class AccessControlListManager(models.Manager):
                     ct_fk_combination__in=content_type_object_id_queryset
                 ).values('object_id')
 
-                field_lookup = '{}object_id__in'.format(recuisive_related_reference)
+                field_lookup = 'object_id__in'
+
                 result.append(Q(**{field_lookup: acl_filter}))
             else:
                 # Case 2: Related field of a single type, single ContentType,
@@ -114,7 +97,6 @@ class AccessControlListManager(models.Manager):
 
                 # Case 5: Related field, has an inherited related field itself
                 # Bubble up permssion check
-                # Recurse and reduce
                 # TODO: Add relationship support: OR or AND
                 # TODO: OR for document pages, version, doc, and types
                 # TODO: AND for new cabinet levels ACLs
@@ -218,26 +200,28 @@ class AccessControlListManager(models.Manager):
 
         return result
 
-    def check_access(self, obj, permissions, user):
+    def check_access(self, obj, permissions, user, manager=None):
         # Allow specific managers for models that have more than one
         # for example the Document model when checking for access for a trashed
         # document.
 
-        meta = getattr(obj, '_meta', None)
-
-        if not meta:
-            logger.debug(
-                ugettext(
-                    'Object "%s" is not a model and cannot be checked for '
-                    'access.'
-                ) % force_text(obj)
-            )
-            return True
-        else:
-            manager = ModelPermission.get_manager(model=obj._meta.model)
+        if manager:
             source_queryset = manager.all()
+        else:
+            meta = getattr(obj, '_meta', None)
 
-        restricted_queryset = manager.none()
+            if not meta:
+                logger.debug(
+                    ugettext(
+                        'Object "%s" is not a model and cannot be checked for '
+                        'access.'
+                    ) % force_text(obj)
+                )
+                return True
+            else:
+                source_queryset = obj._meta.default_manager.all()
+
+        restricted_queryset = obj._meta.default_manager.none()
         for permission in permissions:
             # Default relationship betweens permissions is OR
             # TODO: Add support for AND relationship

mayan/apps/acls/tests/test_api.py

@@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals
 from rest_framework import status
 
 from mayan.apps.permissions.tests.literals import TEST_ROLE_LABEL
-from mayan.apps.rest_api.tests.base import BaseAPITestCase
+from mayan.apps.rest_api.tests import BaseAPITestCase
 
 from ..models import AccessControlList
 from ..permissions import permission_acl_edit, permission_acl_view

mayan/apps/acls/tests/test_classes.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
-from mayan.apps.common.tests.base import BaseTestCase
+from mayan.apps.common.tests import BaseTestCase
 
 from ..classes import ModelPermission
 

mayan/apps/acls/tests/test_links.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.urls import reverse
 
-from mayan.apps.common.tests.base import GenericViewTestCase
+from mayan.apps.common.tests import GenericViewTestCase
 
 from ..links import (
     link_acl_delete, link_acl_list, link_acl_create, link_acl_permissions

mayan/apps/acls/tests/test_models.py

@@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals
 from django.core.exceptions import PermissionDenied
 from django.db import models
 
-from mayan.apps.common.tests.base import BaseTestCase
+from mayan.apps.common.tests import BaseTestCase
 
 from ..classes import ModelPermission
 from ..models import AccessControlList

mayan/apps/acls/tests/test_views.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
-from mayan.apps.common.tests.base import GenericViewTestCase
+from mayan.apps.common.tests import GenericViewTestCase
 
 from ..models import AccessControlList
 from ..permissions import permission_acl_edit, permission_acl_view

mayan/apps/acls/workflow_actions.py

@@ -16,6 +16,7 @@ from mayan.apps.permissions.models import Role
 from .classes import ModelPermission
 from .permissions import permission_acl_edit
 
+__all__ = ('GrantAccessAction', 'RevokeAccessAction')
 logger = logging.getLogger(__name__)
 
 
@@ -56,7 +57,7 @@ class GrantAccessAction(WorkflowAction):
         }
     }
     field_order = ('content_type', 'object_id', 'roles', 'permissions')
-    label = _('Grant object access')
+    label = _('Grant access')
     widgets = {
         'content_type': {
             'class': 'django.forms.widgets.Select', 'kwargs': {
@@ -139,7 +140,7 @@ class GrantAccessAction(WorkflowAction):
 
 
 class RevokeAccessAction(GrantAccessAction):
-    label = _('Revoke object access')
+    label = _('Revoke access')
 
     def execute(self, context):
         self.get_execute_data()

mayan/apps/appearance/literals.py

@@ -1,2 +1 @@
 DEFAULT_MAXIMUM_TITLE_LENGTH = 120
-DEFAULT_MESSAGE_POSITION = 'top-right'

mayan/apps/appearance/locale/ar/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/ar/)\n"

mayan/apps/appearance/locale/bg/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/language/bg/)\n"

mayan/apps/appearance/locale/bs_BA/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/rosarior/mayan-edms/language/bs_BA/)\n"

mayan/apps/appearance/locale/cs/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Czech (http://www.transifex.com/rosarior/mayan-edms/language/cs/)\n"

mayan/apps/appearance/locale/da_DK/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (Denmark) (http://www.transifex.com/rosarior/mayan-edms/language/da_DK/)\n"

mayan/apps/appearance/locale/de_DE/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-edms/language/de_DE/)\n"

mayan/apps/appearance/locale/el/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Greek (http://www.transifex.com/rosarior/mayan-edms/language/el/)\n"

mayan/apps/appearance/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

mayan/apps/appearance/locale/es/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 06:49+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/language/es/)\n"

mayan/apps/appearance/locale/fa/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/language/fa/)\n"

mayan/apps/appearance/locale/fr/LC_MESSAGES/django.po

@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
-"PO-Revision-Date: 2019-08-22 14:03+0000\n"
-"Last-Translator: Frédéric Sheedy <sheedf@gmail.com>\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
+"Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -195,7 +195,7 @@ msgstr "Avertissement"
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
-msgstr "Les paramètres ont été mis à jour, redémarrez votre installation pour que les modifications prennent effet."
+msgstr ""
 
 #: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104

mayan/apps/appearance/locale/hu/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/language/hu/)\n"

mayan/apps/appearance/locale/id/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/language/id/)\n"

mayan/apps/appearance/locale/it/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/language/it/)\n"

mayan/apps/appearance/locale/lv/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Latvian (http://www.transifex.com/rosarior/mayan-edms/language/lv/)\n"

mayan/apps/appearance/locale/nl_NL/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-edms/language/nl_NL/)\n"

mayan/apps/appearance/locale/pl/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/pl/)\n"

mayan/apps/appearance/locale/pt/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/language/pt/)\n"

mayan/apps/appearance/locale/pt_BR/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-edms/language/pt_BR/)\n"

mayan/apps/appearance/locale/ro_RO/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-edms/language/ro_RO/)\n"

mayan/apps/appearance/locale/ru/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/language/ru/)\n"

mayan/apps/appearance/locale/sl_SI/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-edms/language/sl_SI/)\n"

mayan/apps/appearance/locale/tr_TR/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/rosarior/mayan-edms/language/tr_TR/)\n"

mayan/apps/appearance/locale/vi_VN/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/mayan-edms/language/vi_VN/)\n"

mayan/apps/appearance/locale/zh/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-25 20:27-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (http://www.transifex.com/rosarior/mayan-edms/language/zh/)\n"

mayan/apps/appearance/settings.py

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.smart_settings.classes import Namespace
 
-from .literals import DEFAULT_MAXIMUM_TITLE_LENGTH, DEFAULT_MESSAGE_POSITION
+from .literals import DEFAULT_MAXIMUM_TITLE_LENGTH
 
 namespace = Namespace(label=_('Appearance'), name='appearance')
 
@@ -15,11 +15,3 @@ setting_max_title_length = namespace.add_setting(
         'title.'
     )
 )
-setting_message_position = namespace.add_setting(
-    default=DEFAULT_MESSAGE_POSITION,
-    global_name='APPEARANCE_MESSAGE_POSITION', help_text=_(
-        'Position where the system message will be displayed. Options are: '
-        'top-left, top-center, top-right, bottom-left, bottom-center, '
-        'bottom-right.'
-    )
-)

mayan/apps/appearance/static/appearance/css/base.css

@@ -98,10 +98,14 @@ hr {
     min-height: 120px;
     padding-bottom: 1px;
     padding-top: 20px;
-    text-shadow: 1px 1px 3px rgba(0, 0, 0, 1);
+    text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
     white-space: normal;
 }
 
+.btn-block .fa {
+    text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+}
+
 .radio ul li {
     list-style-type:none;
 }
@@ -111,10 +115,14 @@ a i {
 }
 
 .dashboard-widget {
-    box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.7);
+    box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
     border: 1px solid black;
 }
 
+.dashboard-widget .panel-heading i {
+    text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+}
+
 .dashboard-widget-icon {
     font-size: 200%;
 }
@@ -212,18 +220,6 @@ a i {
     font-weight: bold;
 }
 
-.panel-highlighted {
-    box-shadow: 0px 0px 3px #18bc9c, 10px 10px 20px #000000;
-}
-
-.panel-highlighted:hover {
-    box-shadow: 0px 0px 3px #18bc9c, 10px 10px 20px #000000, 0px 0px 8px #000000;
-}
-
-.panel-item:not(.panel-highlighted):hover  {
-    box-shadow: 0px 0px 8px #000000;
-}
-
 /* Content */
 @media (min-width:1200px) {
     .container-fluid {
@@ -253,6 +249,14 @@ a i {
     margin: auto;
 }
 
+.thin_border {
+    border: 1px solid black;
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+
 .thin_border-thumbnail {
   display: block;
   max-width: 100%;
@@ -262,14 +266,6 @@ a i {
   margin: auto;
 }
 
-/* Must go after .thin_border-thumbnail */
-.thin_border {
-    border: 1px solid black;
-    display: inline;
-    margin-left: 0px;
-    margin-right: 0px;
-}
-
 #ajax-spinner {
     position: fixed;
     top: 16px;
@@ -540,20 +536,5 @@ a i {
 }
 
 .navbar-fixed-top {
-    box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.4);
-}
-
-.toolbar {
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    box-shadow: 1px 1px 2px rgba(0, 0, 0, .3);
-    margin-bottom: 10px;
-    padding-bottom: 8px;
-    padding-left: 12px;
-    padding-right: 15px;
-    padding-top: 8px;
-}
-
-#body-plain {
-    padding-top: 0px;
-    margin-top: 10px;
+    box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.5);
 }

mayan/apps/appearance/static/appearance/js/base.js

@@ -6,8 +6,7 @@ var MayanAppClass = MayanApp;
 
 var partialNavigation = new PartialNavigation({
     initialURL: initialURL,
-    disabledAnchorClasses: [
-        'btn-multi-item-action', 'disabled', 'pagination-disabled'
-    ],
+    disabledAnchorClasses: ['disabled'],
     excludeAnchorClasses: ['fancybox', 'new_window', 'non-ajax'],
+    formBeforeSerializeCallbacks: [MayanApp.MultiObjectFormProcess],
 });

mayan/apps/appearance/static/appearance/js/mayan_app.js

@@ -4,7 +4,7 @@ class MayanApp {
     constructor (options) {
         var self = this;
 
-        this.options = options || {
+        options = options || {
             ajaxMenusOptions: []
         }
 
@@ -17,45 +17,38 @@ class MayanApp {
 
     // Class methods and variables
 
-    static countChecked() {
-        var checkCount = $('.check-all-slave:checked').length;
+    static MultiObjectFormProcess ($form, options) {
+        /*
+         * ajaxForm callback to add the external item checkboxes to the
+         * submitted form
+         */
 
-        if (checkCount) {
-            $('#multi-item-title').hide();
-            $('#multi-item-actions').show();
-        } else {
-            $('#multi-item-title').show();
-            $('#multi-item-actions').hide();
-        }
-    }
+        if ($form.hasClass('form-multi-object-action')) {
+            // Turn form data into an object
+            var formArray = $form.serializeArray().reduce(function (obj, item) {
+                obj[item.name] = item.value;
+                return obj;
+            }, {});
 
-    static setupMultiItemActions () {
-        $('body').on('change', '.check-all-slave', function () {
-            MayanApp.countChecked();
-        });
-
-        $('body').on('click', '.btn-multi-item-action', function (event) {
-            var id_list = [];
-            $('.check-all-slave:checked').each(function (index, value) {
-                //Split the name (ie:"pk_200") and extract only the ID
-                id_list.push(value.name.split('_')[1]);
+            // Add all checked checkboxes to the form data
+            $('.form-multi-object-action-checkbox:checked').each(function() {
+                var $this = $(this);
+                formArray[$this.attr('name')] = $this.attr('value');
             });
-            event.preventDefault();
-            partialNavigation.setLocation(
-                $(this).attr('href') + '?id_list=' + id_list.join(',')
-            );
-        });
+
+            // Set the form data as the data to send
+            options.data = formArray;
+        }
     }
 
     static setupNavBarState () {
         $('body').on('click', '.a-main-menu-accordion-link', function (event) {
-            var $this = $(this);
-
+            console.log('ad');
             $('.a-main-menu-accordion-link').each(function (index, value) {
-                $this.parent().removeClass('active');
+                $(this).parent().removeClass('active');
             });
 
-            $this.parent().addClass('active');
+            $(this).parent().addClass('active');
         });
     }
 
@@ -64,10 +57,8 @@ class MayanApp {
         var uriFragment = uri.fragment();
         $('.a-main-menu-accordion-link').each(function (index, value) {
             if (value.pathname === uriFragment) {
-                var $this = $(this);
-
-                $this.closest('.collapse').addClass('in').parent().find('.collapsed').removeClass('collapsed').attr('aria-expanded', 'true');
-                $this.parent().addClass('active');
+                $(this).closest('.collapse').addClass('in').parent().find('.collapsed').removeClass('collapsed').attr('aria-expanded', 'true');
+                $(this).parent().addClass('active');
             }
         });
     }
@@ -80,13 +71,6 @@ class MayanApp {
         }
     }
 
-    doBodyAdjust () {
-        // Adjust the height of the body-spacer to move content elements
-        // up or down when the navbar changes size.
-        const navbarSize = 60;
-        $('.body-spacer').css('height', $('.navbar').height() - navbarSize);
-    }
-
     doRefreshAJAXMenu (options) {
         $.ajax({
             complete: function() {
@@ -99,7 +83,7 @@ class MayanApp {
                     $(options.menuSelector).html(data.html);
                     options.app.ajaxMenuHashes[data.name] = data.hex_hash;
                     if (options.callback !== undefined) {
-                        options.callback(options);
+                        options.callback();
                     }
                 }
             },
@@ -112,7 +96,7 @@ class MayanApp {
             'closeButton': true,
             'debug': false,
             'newestOnTop': true,
-            'positionClass': 'toast-' + this.options.messagePosition,
+            'positionClass': 'toast-top-right',
             'preventDuplicates': false,
             'onclick': null,
             'showDuration': '300',
@@ -182,11 +166,10 @@ class MayanApp {
         var self = this;
 
         this.setupAJAXSpinner();
-        this.setupBodyAdjust();
+        this.setupAutoSubmit();
         this.setupFormHotkeys();
         this.setupFullHeightResizing();
         this.setupItemsSelector();
-        MayanApp.setupMultiItemActions();
         this.setupNavbarCollapse();
         MayanApp.setupNavBarState();
         this.setupNewWindowAnchor();
@@ -194,7 +177,6 @@ class MayanApp {
             value.app = self;
             app.doRefreshAJAXMenu(value);
         });
-        this.setupPanelSelection();
         partialNavigation.initialize();
     }
 
@@ -218,11 +200,11 @@ class MayanApp {
         });
     }
 
-    setupBodyAdjust () {
-        var self = this;
-
-        this.window.resize(function() {
-            self.doBodyAdjust();
+    setupAutoSubmit () {
+        $('body').on('change', '.select-auto-submit', function () {
+            if ($(this).val()) {
+                $(this.form).trigger('submit');
+            }
         });
     }
 
@@ -256,22 +238,9 @@ class MayanApp {
         app.lastChecked = null;
 
         $('body').on('click', '.check-all', function (event) {
-            var $this = $(this);
             var checked = $(event.target).prop('checked');
             var $checkBoxes = $('.check-all-slave');
 
-            if (checked === undefined) {
-                checked = $this.data('checked');
-                checked = !checked;
-                $this.data('checked', checked);
-
-                if (checked) {
-                    $this.find('[data-fa-i2svg]').addClass($this.data('icon-checked')).removeClass($this.data('icon-unchecked'));
-                } else {
-                    $this.find('[data-fa-i2svg]').addClass($this.data('icon-unchecked')).removeClass($this.data('icon-checked'));
-                }
-            }
-
             $checkBoxes.prop('checked', checked);
             $checkBoxes.trigger('change');
         });
@@ -317,58 +286,6 @@ class MayanApp {
         });
     }
 
-    setupPanelSelection () {
-        var app = this;
-
-        // Setup panel highlighting on check
-        $('body').on('change', '.check-all-slave', function (event) {
-            var checked = $(event.target).prop('checked');
-            if (checked) {
-                $(this).closest('.panel-item').addClass('panel-highlighted');
-            } else {
-                $(this).closest('.panel-item').removeClass('panel-highlighted');
-            }
-        });
-
-        $('body').on('click', '.panel-item', function (event) {
-            var $this = $(this);
-            var targetSrc = $(event.target).prop('src');
-            var targetHref = $(event.target).prop('href');
-            var targetIsButton = event.target.tagName === 'BUTTON';
-            var lastChecked = null;
-
-            if ((targetSrc === undefined) && (targetHref === undefined) && (targetIsButton === false)) {
-                var $checkbox = $this.find('.check-all-slave');
-                var checked = $checkbox.prop('checked');
-
-                if (checked) {
-                    $checkbox.prop('checked', '');
-                    $checkbox.trigger('change');
-                } else {
-                    $checkbox.prop('checked', 'checked');
-                    $checkbox.trigger('change');
-                }
-
-                if(!app.lastChecked) {
-                    app.lastChecked = $checkbox;
-                }
-
-                if (event.shiftKey) {
-                    var $checkBoxes = $('.check-all-slave');
-
-                    var start = $checkBoxes.index($checkbox);
-                    var end = $checkBoxes.index(app.lastChecked);
-
-                    $checkBoxes.slice(
-                        Math.min(start, end), Math.max(start, end) + 1
-                    ).prop('checked', app.lastChecked.prop('checked')).trigger('change');
-                }
-                app.lastChecked = $checkbox;
-                window.getSelection().removeAllRanges();
-            }
-        });
-    }
-
     setupScrollView () {
         $('.scrollable').scrollview();
     }

mayan/apps/appearance/templates/appearance/about.html

@@ -1,168 +1,156 @@
-{% extends 'appearance/base.html' %}
-
-{% load i18n %}
-{% load static %}
-
-{% load appearance_tags %}
-{% load common_tags %}
-{% load smart_settings_tags %}
-
-{% block title %}{% trans 'About' %}{% endblock %}
-
-{% block stylesheets %}
-    <style>
-        @font-face {
-            font-family: 'mayan-edms';
-            src: url("{% static 'appearance/fonts/mayan-edms.ttf' %}") format('truetype');
-            font-weight: normal;
-            font-style: normal;
-        }
-
-        [class^="icon-"], [class*=" icon-"] {
-            font-family: 'mayan-edms';
-            speak: none;
-            font-style: normal;
-            font-weight: normal;
-            font-variant: normal;
-            text-transform: none;
-            line-height: 1;
-            -webkit-font-smoothing: antialiased;
-            -moz-osx-font-smoothing: grayscale;
-        }
-
-        .icon-mayan-edms-logo:before {
-            content: "\e600";
-            font-size: 150%;
-        }
-
-        .mayan-edms-logo {
-            font-family: 'IM Fell English SC', serif;
-            font-size: 150%;
-            text-shadow: 5px 5px 1px rgba(0, 0, 0, 0.3);
-        }
-
-        @media (min-width: 768px) {
-            .mayan-edms-logo {
-                font-size: 300%;
-            }
-        }
-
-        @media (min-width: 991px) {
-            .mayan-edms-logo {
-                font-size: 500%;
-            }
-        }
-    </style>
-{% endblock stylesheets %}
-
-{% block content %}
-    {% project_information '__build_string__' as build_number %}
-    {% smart_setting 'COMMON_PROJECT_TITLE' as setting_project_title %}
-    {% project_information '__title__' as project_title %}
-
-    {% get_icon 'mayan.apps.common.icons.icon_documentation' as icon_documentation %}
-    {% get_icon 'mayan.apps.common.icons.icon_forum' as icon_forum %}
-    {% get_icon 'mayan.apps.common.icons.icon_social_facebook' as icon_social_facebook %}
-    {% get_icon 'mayan.apps.common.icons.icon_social_paypal' as icon_social_paypal %}
-    {% get_icon 'mayan.apps.common.icons.icon_social_twitter' as icon_social_twitter %}
-    {% get_icon 'mayan.apps.common.icons.icon_social_instagram' as icon_social_instagram %}
-    {% get_icon 'mayan.apps.common.icons.icon_source_code' as icon_source_code %}
-    {% get_icon 'mayan.apps.common.icons.icon_wiki' as icon_wiki %}
-
-    <div class="well">
-        <h3 class="text-center">{{ setting_project_title }}</h3>
-        {% if project_title != setting_project_title %}
-            <br>
-            <p class="text-center">
-                {% blocktrans with setting_project_title as setting_project_title and project_title as project_title %}
-                    {{ setting_project_title }} is based on {{ project_title }}
-                {% endblocktrans %}
-            </p>
-        {% endif %}
-        <p class="text-center">{% trans 'Version' %} {% project_information '__version__' %}</p>
-        {% if build_number %}
-            <p class='text-center'>{% blocktrans with build_number as build_number %}Build number: {{ build_number }}{% endblocktrans %}</p>
-        {% endif %}
-        <p class="text-center">
-            {% project_information '__description__' as project_description %}
-            {% trans project_description %}
-        </p>
-
-        <p class="text-center">
-            <i class="fa fa-home"></i><a href="{% project_information '__website__' %}"> {% project_information '__website__' %}</a>
-        </p>
-
-        <p class="text-center">
-            {% project_information '__license__' as license_information %}
-            {% trans 'Released under the license:' %} {% trans license_information %}
-        </p>
-
-        <p class="text-center mayan-edms-logo"><span class="icon-mayan-edms-logo"></span> {% project_information '__title__' %}</p>
-
-        <p class="text-center">
-            {% blocktrans with project_title as project_title %}
-                {{ project_title }} is a free and open-source software brought to you with <i class="fa fa-heart text-danger" style="transform: rotate(10deg);"></i> by Roberto Rosario and contributors.
-            {% endblocktrans %}
-        </p>
-
-        <p class="text-center">
-            {% blocktrans with project_title as project_title %}
-                It takes great effort to make {{ project_title }} as feature-rich as it is. We need all the help we can get!
-            {% endblocktrans %}
-        </p>
-
-        <p class="text-center">
-            {% blocktrans with project_title as project_title and icon_social_paypal as icon_social_paypal%}
-                If you use {{ project_title }} please <a class="new_window" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3PXN336XFXQNN">consider making a donation {{ icon_social_paypal }}</a>
-            {% endblocktrans %}
-        </p>
-
-        <p class="text-center">
-            {% blocktrans with icon_social_paypal as icon_social_paypal%}
-                You can also <a class="new_window" href="https://www.paypal.com/paypalme2/RobertoRosario">donate directly to the creator and lead developer.  {{ icon_social_paypal }}</a>
-            {% endblocktrans %}
-        </p>
-
-        <p class="text-center">
-            {% blocktrans with icon_social_paypal as icon_social_paypal%}
-                Besides donations you can also support the project by <a class="new_window" href="https://sellfy.com/p/um2fkx/">purchasing a copy of the book "Exploring Mayan EDMS" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.
-            {% endblocktrans %}
-        </p>
-
-        <p class="text-center">
-            {% blocktrans with icon_documentation as icon_documentation and icon_wiki as icon_wiki %}
-                The complete list of changes is available via the <a class="new_window" href="https://docs.mayan-edms.com/releases/index.html">Release notes {{ icon_documentation }}</a> or the short version <a class="new_window" href="https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst">Changelog {{ icon_documentation }}</a>.
-            {% endblocktrans %}
-        </p>
-
-        <p class="text-center">
-            {% blocktrans with icon_documentation as icon_documentation and icon_wiki as icon_wiki %}
-                For questions check the <a class="new_window" href="https://docs.mayan-edms.com">Documentation {{ icon_documentation }}</a> or the <a class="new_window" href="https://wiki.mayan-edms.com">Wiki {{ icon_wiki }}</a>.
-            {% endblocktrans %}
-        </p>
-
-        <p class="text-center">
-            {% blocktrans with icon_forum as icon_forum and icon_source_code as icon_source_code %}
-                If you found a bug or have a feature idea, visit the <a class="new_window" href="https://forum.mayan-edms.com">Forum {{ icon_forum }}</a> or open a ticket in the <a class="new_window" href="https://gitlab.com/mayan-edms/mayan-edms">Source code repository {{ icon_source_code }}</a>.
-            {% endblocktrans %}
-        </p>
-        <p class="text-center">
-            {% blocktrans with project_title as project_title and icon_twitter as icon_twitter and icon_facebook as icon_facebook and icon_instagram as icon_instagram %}
-                Spread the word. Talk to your friends and colleagues about how awesome {{ project_title }} is!
-                Follow us on <a class="new_window" href="https://twitter.com/mayanedms">Twitter {{ icon_social_twitter }}</a>, <a class="new_window" href="https://www.facebook.com/MayanEDMS/">Facebook {{ icon_social_facebook }}</a>, or <a class="new_window" href="https://www.instagram.com/mayan_edms/">Instagram {{ icon_social_instagram }}</a>
-            {% endblocktrans %}
-        </p>
-    </div>
-{% endblock %}
-
-{% block footer %}
-    <div id="row">
-        <div class="col-xs-12">
-            <div class="panel panel-default">
-                <div class="panel-body">
-                    {% project_information '__copyright__' %}
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
+{% extends 'appearance/base.html' %}
+
+{% load i18n %}
+{% load static %}
+
+{% load appearance_tags %}
+{% load common_tags %}
+{% load smart_settings_tags %}
+
+{% block title %}{% trans 'About' %}{% endblock %}
+
+{% block stylesheets %}
+    <style>
+        @font-face {
+            font-family: 'mayan-edms';
+            src: url("{% static 'appearance/fonts/mayan-edms.ttf' %}") format('truetype');
+            font-weight: normal;
+            font-style: normal;
+        }
+
+        [class^="icon-"], [class*=" icon-"] {
+            font-family: 'mayan-edms';
+            speak: none;
+            font-style: normal;
+            font-weight: normal;
+            font-variant: normal;
+            text-transform: none;
+            line-height: 1;
+            -webkit-font-smoothing: antialiased;
+            -moz-osx-font-smoothing: grayscale;
+        }
+
+        .icon-mayan-edms-logo:before {
+            content: "\e600";
+            font-size: 150%;
+        }
+
+        .mayan-edms-logo {
+            font-family: 'IM Fell English SC', serif;
+            font-size: 150%;
+            text-shadow: 5px 5px 1px rgba(0, 0, 0, 0.3);
+        }
+
+        @media (min-width: 768px) {
+            .mayan-edms-logo {
+                font-size: 300%;
+            }
+        }
+
+        @media (min-width: 991px) {
+            .mayan-edms-logo {
+                font-size: 500%;
+            }
+        }
+    </style>
+{% endblock stylesheets %}
+
+{% block content %}
+    {% project_information '__build_string__' as build_number %}
+    {% smart_setting 'COMMON_PROJECT_TITLE' as setting_project_title %}
+    {% project_information '__title__' as project_title %}
+
+    {% get_icon 'mayan.apps.common.icons.icon_documentation' as icon_documentation %}
+    {% get_icon 'mayan.apps.common.icons.icon_forum' as icon_forum %}
+    {% get_icon 'mayan.apps.common.icons.icon_social_facebook' as icon_social_facebook %}
+    {% get_icon 'mayan.apps.common.icons.icon_social_paypal' as icon_social_paypal %}
+    {% get_icon 'mayan.apps.common.icons.icon_social_twitter' as icon_social_twitter %}
+    {% get_icon 'mayan.apps.common.icons.icon_social_instagram' as icon_social_instagram %}
+    {% get_icon 'mayan.apps.common.icons.icon_source_code' as icon_source_code %}
+    {% get_icon 'mayan.apps.common.icons.icon_wiki' as icon_wiki %}
+
+    <div class="well">
+        <h3 class="text-center">{{ setting_project_title }}</h3>
+        {% if project_title != setting_project_title %}
+            <br>
+            <p class="text-center">
+                {% blocktrans with setting_project_title as setting_project_title and project_title as project_title %}
+                    {{ setting_project_title }} is based on {{ project_title }}
+                {% endblocktrans %}
+            </p>
+        {% endif %}
+        <p class="text-center">{% trans 'Version' %} {% project_information '__version__' %}</p>
+        {% if build_number %}
+            <p class='text-center'>{% blocktrans with build_number as build_number %}Build number: {{ build_number }}{% endblocktrans %}</p>
+        {% endif %}
+        <p class="text-center">
+            {% project_information '__description__' as project_description %}
+            {% trans project_description %}
+        </p>
+
+        <p class="text-center">
+            <i class="fa fa-home"></i><a href="{% project_information '__website__' %}"> {% project_information '__website__' %}</a>
+        </p>
+
+        <p class="text-center">
+            {% project_information '__license__' as license_information %}
+            {% trans 'Released under the license:' %} {% trans license_information %}
+        </p>
+
+        <p class="text-center mayan-edms-logo"><span class="icon-mayan-edms-logo"></span> {% project_information '__title__' %}</p>
+
+        <p class="text-center">
+            {% blocktrans with project_title as project_title %}
+                {{ project_title }} is a free and open-source software brought to you with <i class="fa fa-heart text-danger" style="transform: rotate(10deg);"></i> by Roberto Rosario and contributors.
+            {% endblocktrans %}
+        </p>
+
+        <p class="text-center">
+            {% blocktrans with project_title as project_title %}
+                It takes great effort to make {{ project_title }} as feature-rich as it is. We need all the help we can get!
+            {% endblocktrans %}
+        </p>
+
+        <p class="text-center">
+            {% blocktrans with project_title as project_title and icon_social_paypal as icon_social_paypal%}
+                If you use {{ project_title }} please <a class="new_window" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3PXN336XFXQNN">consider making a donation {{ icon_social_paypal }}</a>
+            {% endblocktrans %}
+        </p>
+
+        <p class="text-center">
+            {% blocktrans with icon_documentation as icon_documentation and icon_wiki as icon_wiki %}
+                The complete list of changes is available via the <a class="new_window" href="https://docs.mayan-edms.com/releases/index.html">Release notes {{ icon_documentation }}</a> or the short version <a class="new_window" href="https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst">Changelog {{ icon_documentation }}</a>.
+            {% endblocktrans %}
+        </p>
+
+        <p class="text-center">
+            {% blocktrans with icon_documentation as icon_documentation and icon_wiki as icon_wiki %}
+                For questions check the <a class="new_window" href="https://docs.mayan-edms.com">Documentation {{ icon_documentation }}</a> or the <a class="new_window" href="https://wiki.mayan-edms.com">Wiki {{ icon_wiki }}</a>.
+            {% endblocktrans %}
+        </p>
+
+        <p class="text-center">
+            {% blocktrans with icon_forum as icon_forum and icon_source_code as icon_source_code %}
+                If you found a bug or have a feature idea, visit the <a class="new_window" href="https://forum.mayan-edms.com">Forum {{ icon_forum }}</a> or open a ticket in the <a class="new_window" href="https://gitlab.com/mayan-edms/mayan-edms">Source code repository {{ icon_source_code }}</a>.
+            {% endblocktrans %}
+        </p>
+        <p class="text-center">
+            {% blocktrans with project_title as project_title and icon_twitter as icon_twitter and icon_facebook as icon_facebook and icon_instagram as icon_instagram %}
+                Spread the word. Talk to your friends and colleagues about how awesome {{ project_title }} is!
+                Follow us on <a class="new_window" href="https://twitter.com/mayanedms">Twitter {{ icon_social_twitter }}</a>, <a class="new_window" href="https://www.facebook.com/MayanEDMS/">Facebook {{ icon_social_facebook }}</a>, or <a class="new_window" href="https://www.instagram.com/mayan_edms/">Instagram {{ icon_social_instagram }}</a>
+            {% endblocktrans %}
+        </p>
+    </div>
+{% endblock %}
+
+{% block footer %}
+    <div id="row">
+        <div class="col-xs-12">
+            <div class="panel panel-default">
+                <div class="panel-body">
+                    {% project_information '__copyright__' %}
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}

mayan/apps/appearance/templates/appearance/base.html

@@ -1,153 +1,147 @@
-{% load i18n %}
-{% load static %}
-
-{% load common_tags %}
-{% load navigation_tags %}
-{% load smart_settings_tags %}
-
-<script>
-    if (typeof partialNavigation === 'undefined') {
-        /* Check if the template was not loaded via AJAX
-         * If not then reload the root path passing the
-         * current location's path as the new hash
-         */
-        document.write('<script type="text/undefined">')
-        var currentPath = window.location.pathname + window.location.search;
-        window.location = '/#' + currentPath;
-    }
-</script>
-
-{% block stylesheets %}{% endblock %}
-
-{% if appearance_type == 'plain' %}
-    {% block content_plain %}{% endblock %}
-{% else %}
-    <div class="">
-
-        {% navigation_resolve_menus names='facet,list facet' sort_results=True as facet_menus_link_results %}
-
-        <div class="row zero-margin">
-            <div class="col-xs-12 {% if facet_menus_link_results %}has-sidebar{% endif %}" id="viewport">
-                <div class="row zero-margin">
-                    <div class="col-xs-12">
-                        {% common_check_sqlite as check_sqlite %}
-                        {% if common_check_sqlite %}
-                            <div class="alert alert-dismissible alert-warning">
-                                <button type="button" class="close" data-dismiss="alert">&times;</button>
-                                <p><strong>{% trans 'Warning' %}</strong> {{ check_sqlite }}</p>
-                            </div>
-                        {% endif %}
-                        {% block messages %}
-                        {% endblock %}
-
-                        {% smart_settings_check_changed as settings_changed %}
-                        {% if settings_changed %}
-                            <div class="alert alert-dismissible alert-warning">
-                                <button type="button" class="close" data-dismiss="alert">&times;</button>
-                                <p><strong>{% trans 'Warning' %}</strong> {% trans 'Settings updated, restart your installation and refresh your browser for changes to take effect.' %}</p>
-                            </div>
-                        {% endif %}
-                    </div>
-                </div>
-
-                {% include 'appearance/calculate_form_title.html' %}
-
-                {# action menu #}
-                {% navigation_resolve_menus names='object,secondary' sort_results=True as action_menus_link_results %}
-                {% if action_menus_link_results %}
-                    <div class="pull-right btn-group" id="menu-actions">
-                        <div class="body-spacer"></div>
-                        <button aria-expanded="true" class="btn btn-danger btn-sm dropdown-toggle" data-toggle="dropdown" type="button">
-                            {% trans 'Actions' %}
-                            <span class="caret"></span>
-                            <span class="sr-only">{% trans 'Toggle Dropdown' %}</span>
-                        </button>
-                        <ul class="dropdown-menu" role="menu">
-                            {% for menus_link_result in action_menus_link_results %}
-                                {% if action_menus_link_results|length > 1 %}
-                                    <li class="dropdown-header">{{ menus_link_result.menu.label }}</li>
-                                {% endif %}
-
-                                {% for link_group in menus_link_result.link_groups %}
-                                    {% if navigation_object_list %}
-
-                                        {% ifchanged link_group.object %}
-                                        {% common_get_object_verbose_name obj=link_group.object as link_group_object_verbose_name %}
-                                            {% if link_group_object_verbose_name %}<li class="dropdown-header">{{ link_group_object_verbose_name }}</li>{% endif %}
-                                        {% endifchanged %}
-                                    {% endif %}
-
-                                    {% with link_group.links as object_navigation_links %}
-                                    {% with 'true' as as_li %}
-                                    {% with 'true' as hide_active_anchor %}
-                                    {% with 'btn-sm' as link_classes %}
-                                        {% include 'navigation/generic_navigation.html' %}
-                                    {% endwith %}
-                                    {% endwith %}
-                                    {% endwith %}
-                                    {% endwith %}
-
-                                    {% if not forloop.last and link_group %}
-                                        <li class="divider"></li>
-                                    {% endif %}
-
-                                {% endfor %}
-                                {% if not forloop.last and menus_link_result %}
-                                    <li class="divider"></li>
-                                {% endif %}
-                            {% endfor %}
-
-                        </ul>
-                    </div>
-                    <div class="clearfix"></div>
-                {% endif %}
-
-                {% block content %}{% endblock %}
-                {% block footer %}{% endblock %}
-            </div>
-
-            {% if facet_menus_link_results %}
-                <div id="sidebar">
-                    <div class="body-spacer"></div>
-                    <div class="list-group">
-                        {% for menu_link_result in facet_menus_link_results %}
-                            {% for link_group in menu_link_result.link_groups %}
-                                {% with link_group.links as object_navigation_links %}
-                                {% with 'true' as hide_active_anchor %}
-                                {% with 'active' as link_class_active %}
-                                {% with 'list-group-item btn-sm' as link_classes %}
-                                    {% include 'navigation/generic_navigation.html' %}
-                                {% endwith %}
-                                {% endwith %}
-                                {% endwith %}
-                                {% endwith %}
-                            {% endfor %}
-                        {% endfor %}
-                    </div>
-                </div>
-            {% endif %}
-        </div>
-    </div>
-{% endif %}
-
-<script>
-    var DjangoMessages = [
-        {% for message in messages %}
-            {
-                tags: '{{ message.tags }}',
-                message: '{{ message.message }}'
-            },
-        {% endfor %}
-    ];
-    $(function () {
-      $('[data-toggle="tooltip"]').tooltip();
-    })
-</script>
-{% block javascript %}{% endblock %}
-
-<script>
-    document.title = '{% filter escapejs %}{% spaceless %}{% block title %}{% endblock %} :: {% block project_name %}{% smart_setting "COMMON_PROJECT_TITLE" %}{% endblock %}{% endspaceless %}{% endfilter %}';
-    // Strip HTML entities from the title
-    document.title = document.title.replace(/&(?:[a-z\d]+|#\d+|#x[a-f\d]+);/ig, '');
-    afterBaseLoad();
-</script>
+{% load i18n %}
+{% load static %}
+
+{% load common_tags %}
+{% load navigation_tags %}
+{% load smart_settings_tags %}
+
+<script>
+    if (typeof partialNavigation === 'undefined') {
+        /* Check if the template was not loaded via AJAX
+         * If not then reload the root path passing the
+         * current location's path as the new hash
+         */
+        document.write('<script type="text/undefined">')
+        var currentPath = window.location.pathname + window.location.search;
+        window.location = '/#' + currentPath;
+    }
+</script>
+
+{% block stylesheets %}{% endblock %}
+
+{% if appearance_type == 'plain' %}
+    {% block content_plain %}{% endblock %}
+{% else %}
+    <div class="">
+        <div class="row zero-margin">
+            <div class="col-xs-12">
+                {% common_check_sqlite as check_sqlite %}
+                {% if common_check_sqlite %}
+                    <div class="alert alert-dismissible alert-warning">
+                        <button type="button" class="close" data-dismiss="alert">&times;</button>
+                        <p><strong>{% trans 'Warning' %}</strong> {{ check_sqlite }}</p>
+                    </div>
+                {% endif %}
+                {% block messages %}
+                {% endblock %}
+
+                {% smart_settings_check_changed as settings_changed %}
+                {% if settings_changed %}
+                    <div class="alert alert-dismissible alert-warning">
+                        <button type="button" class="close" data-dismiss="alert">&times;</button>
+                        <p><strong>{% trans 'Warning' %}</strong> {% trans 'Settings updated, restart your installation for changes to take proper effect.' %}</p>
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+
+        {% navigation_resolve_menus names='facet,list facet' sort_results=True as facet_menus_link_results %}
+
+        <div class="row zero-margin">
+            <div class="col-xs-12 {% if facet_menus_link_results %}has-sidebar{% endif %}" id="viewport">
+                {% include 'appearance/calculate_form_title.html' %}
+
+                {# action menu #}
+                {% navigation_resolve_menus names='object,secondary' sort_results=True as action_menus_link_results %}
+                {% if action_menus_link_results %}
+                    <div class="pull-right btn-group" id="menu-actions">
+                        <button aria-expanded="true" class="btn btn-danger btn-sm dropdown-toggle" data-toggle="dropdown" type="button">
+                            {% trans 'Actions' %}
+                            <span class="caret"></span>
+                            <span class="sr-only">{% trans 'Toggle Dropdown' %}</span>
+                        </button>
+                        <ul class="dropdown-menu" role="menu">
+                            {% for menus_link_result in action_menus_link_results %}
+                                {% if action_menus_link_results|length > 1 %}
+                                    <li class="dropdown-header">{{ menus_link_result.menu.label }}</li>
+                                {% endif %}
+
+                                {% for link_group in menus_link_result.link_groups %}
+                                    {% if navigation_object_list %}
+
+                                        {% ifchanged link_group.object %}
+                                        {% common_get_object_verbose_name obj=link_group.object as link_group_object_verbose_name %}
+                                            {% if link_group_object_verbose_name %}<li class="dropdown-header">{{ link_group_object_verbose_name }}</li>{% endif %}
+                                        {% endifchanged %}
+                                    {% endif %}
+
+                                    {% with link_group.links as object_navigation_links %}
+                                    {% with 'true' as as_li %}
+                                    {% with 'true' as hide_active_anchor %}
+                                    {% with 'btn-sm' as link_classes %}
+                                        {% include 'navigation/generic_navigation.html' %}
+                                    {% endwith %}
+                                    {% endwith %}
+                                    {% endwith %}
+                                    {% endwith %}
+
+                                    {% if not forloop.last and link_group %}
+                                        <li class="divider"></li>
+                                    {% endif %}
+
+                                {% endfor %}
+                                {% if not forloop.last and menus_link_result %}
+                                    <li class="divider"></li>
+                                {% endif %}
+                            {% endfor %}
+
+                        </ul>
+                    </div>
+                    <div class="clearfix"></div>
+                {% endif %}
+
+                {% block content %}{% endblock %}
+                {% block footer %}{% endblock %}
+            </div>
+
+            {% if facet_menus_link_results %}
+                <div id="sidebar">
+                    <div class="list-group">
+                        {% for menu_link_result in facet_menus_link_results %}
+                            {% for link_group in menu_link_result.link_groups %}
+                                {% with link_group.links as object_navigation_links %}
+                                {% with 'true' as hide_active_anchor %}
+                                {% with 'active' as link_class_active %}
+                                {% with 'list-group-item btn-sm' as link_classes %}
+                                    {% include 'navigation/generic_navigation.html' %}
+                                {% endwith %}
+                                {% endwith %}
+                                {% endwith %}
+                                {% endwith %}
+                            {% endfor %}
+                        {% endfor %}
+                    </div>
+                </div>
+            {% endif %}
+        </div>
+    </div>
+{% endif %}
+
+<script>
+    var DjangoMessages = [
+        {% for message in messages %}
+            {
+                tags: '{{ message.tags }}',
+                message: '{{ message.message }}'
+            },
+        {% endfor %}
+    ];
+</script>
+{% block javascript %}{% endblock %}
+
+<script>
+    document.title = '{% filter escapejs %}{% spaceless %}{% block title %}{% endblock %} :: {% block project_name %}{% smart_setting "COMMON_PROJECT_TITLE" %}{% endblock %}{% endspaceless %}{% endfilter %}';
+    // Strip HTML entities from the title
+    document.title = document.title.replace(/&(?:[a-z\d]+|#\d+|#x[a-f\d]+);/ig, '');
+    afterBaseLoad();
+</script>

mayan/apps/appearance/templates/appearance/base_plain.html

@@ -33,7 +33,7 @@
             }
         </script>
     </head>
-    <body id="body-plain">
+    <body>
         {% block content_plain %}{% endblock %}
 
         <script src="{% static 'appearance/node_modules/jquery/dist/jquery.min.js' %}" type="text/javascript"></script>

mayan/apps/appearance/templates/appearance/generic_form_instance.html

@@ -45,7 +45,7 @@
         {{ field }}
     {% endfor %}
         {% for field in form.visible_fields %}
-            <div class="form-group {% if field.errors %}has-error{% endif %} {{ form_field_css_classes }}">
+            <div class="form-group {% if field.errors %}has-error{% endif %}">
                 {# We display the label then the field for all except checkboxes #}
                 {% if field|widget_type != 'checkboxinput' and not field.field.widget.attrs.hidden %}
                     {% if not hide_labels %}{{ field.label_tag }}{% if field.field.required and not read_only %} ({% trans 'required' %}){% endif %}{% endif %}

mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html

@@ -11,9 +11,41 @@
                 {% include 'appearance/no_results.html' %}
             </div>
         {% else %}
-            {% include "appearance/list_header.html" %}
-            {% navigation_resolve_menu name='multi item' sort_results=True source=object_list.0 as links_multi_menus_results %}
+            <h4>
+                {% if page_obj %}
+                    {% if page_obj.paginator.num_pages != 1 %}
+                        {% blocktrans with page_obj.start_index as start and page_obj.end_index as end and page_obj.paginator.object_list|length as total and page_obj.number as page_number and page_obj.paginator.num_pages as total_pages %}Total ({{ start }} - {{ end }} out of {{ total }}) (Page {{ page_number }} of {{ total_pages }}){% endblocktrans %}
+                    {% else %}
+                        {% blocktrans with page_obj.paginator.object_list|length as total %}Total: {{ total }}{% endblocktrans %}
+                    {% endif %}
+                {% else %}
+                    {% blocktrans with object_list|length as total %}Total: {{ total }}{% endblocktrans %}
+                {% endif %}
+            </h4>
+            <hr>
             <div class="well center-block">
+                <div class="clearfix">
+                    <div class="pull-right">
+                        <form action="{% url 'common:multi_object_action_view' %}" class="form-multi-object-action" method="get">
+                            {% if object_list %}
+                                {% if not hide_multi_item_actions %}
+                                    {% get_multi_item_links_form object_list %}
+                                {% endif %}
+                                {% if multi_item_actions %}
+                                    <fieldset style="margin-top: -10px;">
+                                        <input class="check-all" type="checkbox"/>&nbsp;
+                                        {{ multi_item_form }}
+                                    </fieldset>
+                                {% endif %}
+                            {% endif %}
+                        </form>
+                    </div>
+                </div>
+
+                {% if object_list %}
+                    <hr style="border-bottom: 1px solid lightgrey;">
+                {% endif %}
+
                 <div class="row row-items">
                     {% for object in object_list %}
                         <div class="{{ column_class|default:'col-xs-12 col-sm-4 col-md-3 col-lg-2' }}">
@@ -21,9 +53,9 @@
                                 <div class="panel-heading">
                                     <div class="form-group">
                                         <div class="checkbox">
-                                            <label for="id_indexes_0" style="cursor: auto;">
-                                                {% if links_multi_menus_results %}
-                                                    <input class="form-multi-object-action-checkbox check-all-slave checkbox" name="pk_{{ object.pk }}" style="cursor: pointer;" type="checkbox" />
+                                            <label for="id_indexes_0">
+                                                {% if multi_item_actions %}
+                                                    <input class="form-multi-object-action-checkbox check-all-slave checkbox" type="checkbox" name="pk_{{ object.pk }}" />
                                                 {% endif %}
 
                                                 <span style="color: white; word-break: break-all; overflow-wrap: break-word;">
@@ -36,7 +68,12 @@
                                                     {% else %}
                                                         {% navigation_get_source_columns source=object only_identifier=True as source_column %}
                                                         {% navigation_source_column_resolve column=source_column as column_value %}
-                                                        {{ column_value }}
+
+                                                        {% if source_column.is_attribute_absolute_url or source_column.is_object_absolute_url %}
+                                                            <a href="{% navigation_source_column_get_absolute_url source_column=source_column obj=object %}">{{ column_value }}</a>
+                                                        {% else %}
+                                                            {{ column_value }}
+                                                        {% endif %}
                                                     {% endif %}
                                                 </span>
                                             </label>
@@ -45,6 +82,7 @@
 
                                 </div>
                                 <div class="panel-body">
+
                                     {% if not hide_columns %}
                                         {% navigation_get_source_columns source=object exclude_identifier=True as source_columns %}
                                         {% for column in source_columns %}
@@ -98,6 +136,7 @@
                         </div>
                     {% endfor %}
                 </div>
+                {% include 'pagination/pagination.html' %}
             </div>
         {% endif %}
     </div>

mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html

@@ -1,7 +1,6 @@
 {% load i18n %}
 {% load static %}
 
-{% load appearance_tags %}
 {% load common_tags %}
 {% load navigation_tags %}
 
@@ -12,16 +11,44 @@
                 {% include 'appearance/no_results.html' %}
             </div>
         {% else %}
-            {% include "appearance/list_header.html" %}
-            {% navigation_resolve_menu name='multi item' sort_results=True source=object_list.0 as links_multi_menus_results %}
+            <h4>
+                {% if page_obj %}
+                    {% if page_obj.paginator.num_pages != 1 %}
+                        {% blocktrans with page_obj.start_index as start and page_obj.end_index as end and page_obj.paginator.object_list|length as total and page_obj.number as page_number and page_obj.paginator.num_pages as total_pages %}Total ({{ start }} - {{ end }} out of {{ total }}) (Page {{ page_number }} of {{ total_pages }}){% endblocktrans %}
+                    {% else %}
+                        {% blocktrans with page_obj.paginator.object_list|length as total %}Total: {{ total }}{% endblocktrans %}
+                    {% endif %}
+                {% else %}
+                    {% blocktrans with object_list|length as total %}Total: {{ total }}{% endblocktrans %}
+                {% endif %}
+            </h4>
+            <hr>
+
             <div class="well center-block">
+                <div class="clearfix">
+                    <div class="pull-right">
+                        <form action="{% url 'common:multi_object_action_view' %}" class="form-multi-object-action" method="get">
+                            {% if object_list %}
+                                {% if not hide_multi_item_actions %}
+                                    {% get_multi_item_links_form object_list %}
+                                {% endif %}
+                                {% if multi_item_actions %}
+                                    <fieldset style="margin-top: -10px; margin-bottom: 10px;">
+                                        {{ multi_item_form }}
+                                    </fieldset>
+                                {% endif %}
+                            {% endif %}
+                        </form>
+                    </div>
+                </div>
+
                 <div class="table-responsive">
                     <table class="table table-condensed table-striped">
                         <tbody>
                             {% if not hide_header %}
                                 <tr>
-                                    {% if links_multi_menus_results %}
-                                        <th class="first"></th>
+                                    {% if multi_item_actions %}
+                                        <th class="first"><input class="checkbox check-all" type="checkbox" /></th>
                                     {% endif %}
 
                                     {% if not hide_object %}
@@ -31,40 +58,30 @@
                                         {% if source_column %}
                                             <th>
                                                 {% if source_column.is_sortable %}
-                                                    <a href="{% navigation_get_sort_field_querystring column=source_column %}">{{ source_column.label }}</a>
+                                                    <a href="{% navigation_get_sort_field_querystring column=source_column %}">{{ source_column.label }}
                                                     {% if source_column.get_sort_field == sort_field %}
                                                         {% if icon_sort %}{{ icon_sort.render }}{% endif %}
                                                     {% endif %}
+                                                    </a>
                                                 {% else %}
                                                     {{ source_column.label }}
                                                 {% endif %}
-
-                                                {% if source_column.help_text %}
-                                                    <span data-toggle="tooltip" data-placement="bottom" title="{{ source_column.help_text }}">
-                                                    {% get_icon icon_path='mayan.apps.navigation.icons.icon_source_column_help_text' %}
-                                                    </span>
-                                                {% endif %}
                                             </th>
                                         {% endif %}
                                     {% endif %}
 
                                     {% if not hide_columns %}
                                         {% navigation_get_source_columns source=object_list exclude_identifier=True as source_columns %}
-                                        {% for source_column in source_columns %}
+                                        {% for column in source_columns %}
                                             <th>
-                                                {% if source_column.is_sortable %}
-                                                    <a href="{% navigation_get_sort_field_querystring column=source_column %}">{{ source_column.label }}</a>
-                                                    {% if source_column.get_sort_field == sort_field %}
+                                                {% if column.is_sortable %}
+                                                    <a href="{% navigation_get_sort_field_querystring column=column %}">{{ column.label }}
+                                                    {% if column.get_sort_field == sort_field %}
                                                         {% if icon_sort %}{{ icon_sort.render }}{% endif %}
                                                     {% endif %}
+                                                    </a>
                                                 {% else %}
-                                                    {{ source_column.label }}
-                                                {% endif %}
-
-                                                {% if source_column.help_text %}
-                                                    <span data-toggle="tooltip" data-placement="bottom" title="{{ source_column.help_text }}">
-                                                    {% get_icon icon_path='mayan.apps.navigation.icons.icon_source_column_help_text' %}
-                                                    </span>
+                                                    {{ column.label }}
                                                 {% endif %}
                                             </th>
                                         {% endfor %}
@@ -82,9 +99,9 @@
                             {% for object in object_list %}
                                 <tr>
 
-                                    {% if links_multi_menus_results %}
+                                    {% if multi_item_actions %}
                                         <td>
-                                            <input class="form-multi-object-action-checkbox check-all-slave checkbox" name="pk_{{ object.pk }}" type="checkbox" value="" />
+                                            <input type="checkbox" class="form-multi-object-action-checkbox check-all-slave checkbox" name="pk_{{ object.pk }}" value="" />
                                         </td>
                                     {% endif %}
 
@@ -95,7 +112,11 @@
                                         {% navigation_source_column_resolve column=source_column as column_value %}
                                         {% if column_value %}
                                             <td>
-                                                {{ column_value }}
+                                                {% if source_column.is_attribute_absolute_url or source_column.is_object_absolute_url %}
+                                                    <a href="{% navigation_source_column_get_absolute_url source_column=source_column obj=object %}">{{ column_value }}</a>
+                                                {% else %}
+                                                    {{ column_value }}
+                                                {% endif %}
                                             </td>
                                         {% endif %}
                                     {% endif %}
@@ -149,6 +170,7 @@
                         </tbody>
                     </table>
                 </div>
+                {% include 'pagination/pagination.html' %}
             </div>
         {% endif %}
     </div>

mayan/apps/appearance/templates/appearance/home.html

@@ -1,49 +1,49 @@
-{% extends 'appearance/base.html' %}
-
-{% load i18n %}
-{% load static %}
-
-{% load common_tags %}
-{% load dashboards_tags %}
-{% load navigation_tags %}
-
-{% block title %}{% trans 'Dashboard' %}{% endblock %}
-
-{% block javascript %}
-    <script>
-        $(function() {
-            $('.match-height').matchHeight();
-        });
-    </script>
-{% endblock javascript %}
-
-{% block content %}
-    <div class="row">
-        <div class="col-xs-12">
-            {% if missing_list %}
-                <div class="panel panel-primary">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">{% trans 'Getting started' %}</h3>
-                    </div>
-                    <div class="panel-body">
-                        {% trans 'Before you can fully use Mayan EDMS you need the following:' %}
-
-                        <div class="list-group">
-                            {% for missing in missing_list %}
-                                <a href="{% url missing.view %}" class="list-group-item">
-                                    <h4 class="list-group-item-heading">{{ missing.label }}</h4>
-                                    <p class="list-group-item-text">{{ missing.description }}</p>
-                                </a>
-                            {% endfor %}
-                        </div>
-                    </div>
-                </div>
-            {% endif %}
-        </div>
-    </div>
-
-    {% include 'dynamic_search/search_box.html' %}
-
-    {% render_dashboard 'main' %}
-
-{% endblock %}
+{% extends 'appearance/base.html' %}
+
+{% load i18n %}
+{% load static %}
+
+{% load common_tags %}
+{% load dashboards_tags %}
+{% load navigation_tags %}
+
+{% block title %}{% trans 'Dashboard' %}{% endblock %}
+
+{% block javascript %}
+    <script>
+        $(function() {
+            $('.match-height').matchHeight();
+        });
+    </script>
+{% endblock javascript %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-xs-12">
+            {% if missing_list %}
+                <div class="panel panel-primary">
+                    <div class="panel-heading">
+                        <h3 class="panel-title">{% trans 'Getting started' %}</h3>
+                    </div>
+                    <div class="panel-body">
+                        {% trans 'Before you can fully use Mayan EDMS you need the following:' %}
+
+                        <div class="list-group">
+                            {% for missing in missing_list %}
+                                <a href="{% url missing.view %}" class="list-group-item">
+                                    <h4 class="list-group-item-heading">{{ missing.label }}</h4>
+                                    <p class="list-group-item-text">{{ missing.description }}</p>
+                                </a>
+                            {% endfor %}
+                        </div>
+                    </div>
+                </div>
+            {% endif %}
+        </div>
+    </div>
+
+    {% include 'dynamic_search/search_box.html' %}
+
+    {% render_dashboard 'main' %}
+
+{% endblock %}