3 files changed, 15 insertions(+), 0 deletions(-)

M wiki/decorators.py
A wiki/templates/wiki/no_organization.html
M wiki/urls.py

@@ 86,6 86,8 @@ def get_article(func=None, can_read=True, can_write=False,  # noqa
         article_id = kwargs.pop('article_id', None)
         org = request.organization
 
+        if org is None:
+            return redirect('wiki:no_organization')
         urlpath = None
 
         # fetch by urlpath.path

@@ 0,0 1,7 @@
+{% extends "wiki/base.html" %}
+
+{% block wiki_pagetitle %}No organization found{% endblock %}
+
+{% block wiki_contents %}
+No organization have been found.
+{% endblock %}

@@ 2,6 2,8 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.conf.urls import include, url
+from django.views.generic import TemplateView
+
 from wiki.conf import settings
 from wiki.core.plugins import registry
 from wiki.core.plugins.loader import load_wiki_plugins


@@ 77,6 79,10 @@ class WikiURLPatterns(object):
             url(r'^_revision/diff/(?P<revision_id>\d+)/$',
                 self.article_diff_view,
                 name='diff'),
+            url(r'^no-organization/$',
+                TemplateView.as_view(
+                    template_name='wiki/no_organization.html'),
+                name='no_organization'),
         ]
         return urlpatterns