From 9efa7c95438c156cc7220410c8ede5795d02bb98 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Mon, 7 Mar 2016 04:13:14 -0400
Subject: [PATCH] Fix typo in document image generation query. Support multiple
 logins using different sessions iDS.

---
 mayan/apps/documents/views.py | 2 +-
 mayan/settings/base.py        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py
index 27d31d8a73..ad00f69779 100644
--- a/mayan/apps/documents/views.py
+++ b/mayan/apps/documents/views.py
@@ -725,7 +725,7 @@ def document_multiple_document_type_edit(request):
 
 # TODO: Get rid of this view and convert widget to use API and base64 only images
 def get_document_image(request, document_id, size=setting_preview_size.value):
-    document = get_object_or_404(Document.passthrough.objects.filter(document_type__organization__id=settings.ORGANIZATION_ID), pk=document_id)
+    document = get_object_or_404(Document.passthrough.filter(document_type__organization__id=settings.ORGANIZATION_ID), pk=document_id)
     try:
         Permission.check_permissions(request.user, (permission_document_view,))
     except PermissionDenied:
diff --git a/mayan/settings/base.py b/mayan/settings/base.py
index b839d7a0b6..aaec522e26 100644
--- a/mayan/settings/base.py
+++ b/mayan/settings/base.py
@@ -106,6 +106,7 @@ MIDDLEWARE_CLASSES = (
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
+    'organizations.middleware.CurrentOrganizationMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
@@ -114,7 +115,6 @@ MIDDLEWARE_CLASSES = (
     'common.middleware.strip_spaces_widdleware.SpacelessMiddleware',
     'authentication.middleware.login_required_middleware.LoginRequiredMiddleware',
     'common.middleware.ajax_redirect.AjaxRedirect',
-    'organizations.middleware.CurrentOrganizationMiddleware',
 )
 
 ROOT_URLCONF = 'mayan.urls'
@@ -292,4 +292,6 @@ ORGANIZATION_ID = 1
 AUTH_USER_MODEL = 'user_management.MayanUser'
 # ------- Authentication -------
 AUTHENTICATION_BACKENDS = ('authentication.auth.model_auth_backend.UsernameModelBackend',)
+# ------- Session ---------
+SESSION_COOKIE_NAME = 'organization-1'