Merge lp:~cbjchen/horizon/lp1382079 into lp:~ubuntu-server-dev/horizon/kilo

[Liang Chen]

SRU for bug 1382079

[Corey Bryant (corey.bryant)]

Liang, I'm sorry. I cherry-picked the patch from your gerritt review without having seen this bzr merge proposal. Nonetheless the fix has been uploaded to kilo-staging in the UCA.

[Liang Chen (cbjchen)]

Corey, that's alright as long as the fix is brought in. Thank you!

[Michael Hudson-Doyle (mwhudson)]

Marking branch as merged to get it off sponsorship report.

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-20 15:04:47 +0000
+++ debian/changelog	2016-03-15 08:56:23 +0000
@@ -1,3 +1,11 @@
+horizon (1:2015.1.2-0ubuntu2) vivid; urgency=medium
+
+  * Remove session caching of can_access to fix project selector problem
+    (LP: #1382079):
+    - d/p/fix-project-selector.patch
+
+ -- Liang Chen <[e-mail]>  Tue, 15 Mar 2016 06:52:19 +0000
+
 horizon (1:2015.1.2-0ubuntu1) vivid; urgency=medium
   
   [ Chuck Short ]
 
=== added file 'debian/patches/fix-project-selector.patch'
--- debian/patches/fix-project-selector.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-project-selector.patch	2016-03-15 08:56:23 +0000
@@ -0,0 +1,40 @@
+From b9570d7c12930342a2d1bb70cbce611892a76512 Mon Sep 17 00:00:00 2001
+From: lin-hua-cheng <[e-mail]>
+Date: Tue, 15 Sep 2015 16:19:25 -0700
+Subject: [PATCH] Remove session caching of can_access call results
+
+Partial revert of commit 16db58fabad8934b8fbdfc6aee0361cc138b20af
+
+Change-Id: I7b80a94117310c92f9eb83541c8d75e2bf638b90
+Closes-Bug: #1450963
+Closes-Bug: #1382079
+(cherry picked from commit fa746811e49b867d4995ab97c6709bdcfca1eb0b)
+---
+
+diff --git a/horizon/base.py b/horizon/base.py
+index 61f944f..2f445b3 100644
+--- a/horizon/base.py
++++ b/horizon/base.py
+@@ -56,6 +56,10 @@
+             _decorate_urlconf(pattern.url_patterns, decorator, *args, **kwargs)
+ 
+ 
++# FIXME(lhcheng): We need to find a better way to cache the result.
++# Rather than storing it in the session, we could leverage the Django
++# session. Currently, thTs has been causing issue with cookie backend,
++# adding 1600+ in the cookie size.
+ def access_cached(func):
+     def inner(self, context):
+         session = context['request'].session
+@@ -107,7 +111,10 @@
+                 urlpatterns = patterns('')
+         return urlpatterns
+ 
+-    @access_cached
++    # FIXME(lhcheng): Removed the access_cached decorator for now until
++    # a better implementation has been figured out. This has been causing
++    # issue with cookie backend, adding 1600+ in the cookie size.
++    # @access_cached
+     def can_access(self, context):
+         """Return whether the user has role based access to this component.
+ 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2015-04-14 13:58:47 +0000
+++ debian/patches/series	2016-03-15 08:56:23 +0000
@@ -3,3 +3,4 @@
 ubuntu_settings.patch
 embedded-xstatic.patch
 add-juju-environment-download.patch
+fix-project-selector.patch