Merge d6e6822 into 3419c6e

src/ralph/account/models.py

@@ -9,9 +9,10 @@
 import functools
 
 
+from django.conf import settings
 from django.contrib.auth.models import Group
 from django.core.handlers.wsgi import WSGIRequest
-from django.core.urlresolvers import reverse
+from django.core.urlresolvers import reverse, NoReverseMatch
 from django.db import models as db
 from django.http import HttpResponseBadRequest
 from django.utils.translation import ugettext_lazy as _
@@ -26,7 +27,6 @@
     ActivationSupport,
     GravatarSupport,
 )
-from pluggableapp import PluggableApp
 
 from ralph.business.models import Venture, VentureRole
 
@@ -280,17 +280,11 @@ def inner_decorator(self, *args, **kwargs):
 
 def get_user_home_page_url(user):
     profile = user.get_profile()
-    redirect_hierarchy = [
-        (Perm.has_scrooge_access, 'ralph_pricing'),
-        (Perm.has_assets_access, 'ralph_assets'),
-    ]
-    for perm_to_module, app_name in redirect_hierarchy:
-        if profile.has_perm(perm_to_module):
-            try:
-                page_url = PluggableApp.apps[app_name].home_url
-                break
-            except KeyError:
-                pass
+    if profile.home_page == AvailableHomePage.default:
+        try:
+            home_page = reverse(settings.HOME_PAGE_URL_NAME, args=[])
+        except NoReverseMatch:
+            home_page = reverse('search')
     else:
-        page_url = reverse('search', args=('info', ''))
-    return page_url
+        home_page = reverse(profile.home_page.name)
+    return home_page

src/ralph/account/views.py

@@ -57,10 +57,6 @@ class BaseUser(Base):
     submodule_name = 'user_preference'
     module_name = 'user_preference'
 
-    @ralph_permission([])
-    def dispatch(self, *args, **kwargs):
-        return super(TemplateView, self).dispatch(*args, **kwargs)
-
     @ralph_permission([])
     def dispatch(self, *args, **kwargs):
         return super(TemplateView, self).dispatch(*args, **kwargs)