From a5a6afe2409a1be4aae1666fde0fed0eeba36e9e Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Mon, 14 Nov 2016 01:44:47 -0400
Subject: [PATCH] Update MultiFormView CBV to work with Django 1.9.x

---
 HISTORY.rst                   |  6 ++++++
 docs/releases/2.2.rst         |  1 +
 mayan/apps/common/generics.py | 12 +++++++++++-
 requirements/common.txt       |  2 +-
 setup.py                      |  2 +-
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index c0788306ce..7180d43ea4 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -6,6 +6,12 @@
 - Remove dependency on the django-filetransfer library
 - Fix height calculation in resize transformation
 - Improve upgrade instructions
+- New image caching pipeline
+- New drop down menus for the documents, folders and tags app as well as for
+the user links
+- New Dashboard view
+- Moved licenses to their own module in every app
+- Update project to work with Django 1.9.11
 
 2.1.5 (2016-11-08)
 ==================
diff --git a/docs/releases/2.2.rst b/docs/releases/2.2.rst
index 75aa8ffce8..94e7e09014 100644
--- a/docs/releases/2.2.rst
+++ b/docs/releases/2.2.rst
@@ -21,6 +21,7 @@ Other changes
 the user links
 - Dashboard
 - Moved licenses to their own module in every app
+- Update project to work with Django 1.9.11
 
 Removals
 --------
diff --git a/mayan/apps/common/generics.py b/mayan/apps/common/generics.py
index 5feec9e02d..d7fd5eff23 100644
--- a/mayan/apps/common/generics.py
+++ b/mayan/apps/common/generics.py
@@ -10,7 +10,7 @@ from django.views.generic import (
 )
 from django.views.generic.detail import SingleObjectMixin
 from django.views.generic.edit import (
-    CreateView, DeleteView, ModelFormMixin, UpdateView
+    CreateView, DeleteView, FormMixin, ModelFormMixin, UpdateView
 )
 from django.views.generic.list import ListView
 
@@ -207,6 +207,16 @@ class MultiFormView(DjangoFormView):
             form = klass(**form_kwargs)
         return form
 
+    def get_context_data(self, **kwargs):
+        """
+        Insert the form into the context dict.
+        """
+        if 'forms' not in kwargs:
+            kwargs['forms'] = self.get_forms(
+                form_classes=self.get_form_classes()
+            )
+        return super(FormMixin, self).get_context_data(**kwargs)
+
     def get_forms(self, form_classes):
         return dict(
             [
diff --git a/requirements/common.txt b/requirements/common.txt
index 966a77c01f..2c0e089e77 100644
--- a/requirements/common.txt
+++ b/requirements/common.txt
@@ -1,2 +1,2 @@
 -r base.txt
-Django==1.8.15
+Django==1.9.11
diff --git a/setup.py b/setup.py
index b2396e91eb..91abdbc887 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ def find_packages(directory):
     return packages
 
 install_requires = """
-Django==1.8.15
+Django==1.9.11
 Pillow==3.1.2
 PyYAML==3.11
 celery==3.1.19