commit a0a4ff93da165d75ed3c2cf54c60366f67078531
author Scott Baker <smbaker@gmail.com> Wed Feb 18 16:50:55 2015 -0800
committer Scott Baker <smbaker@gmail.com> Wed Feb 18 16:50:55 2015 -0800
tree 91ada901fb2082908ce3da19cad55ab841dfc2d5
parent 6ada925846294e310c58241b5ce107cf186cd6b6
parent 7fae31cde03f943dd07a0eb98a8b67f5463e131f

Merge branch 'master' of github.com:open-cloud/xos

planetstack/core/context_processors.py

diff --git a/planetstack/core/context_processors.py b/planetstack/core/context_processors.py
index 9cfcaa6..5933352 100644
--- a/planetstack/core/context_processors.py
+++ b/planetstack/core/context_processors.py
@@ -2,7 +2,7 @@
 from core.models import Site
 
 
-def planetstack(request):
+def xos(request):
     allSites = []
     for site in Site.objects.all():
         allowNewUsers = True    # replace with logic for blessing sites for registration, if necessary

planetstack/xos/settings.py

diff --git a/planetstack/xos/settings.py b/planetstack/xos/settings.py
index 63696c8..f1f4885 100644
--- a/planetstack/xos/settings.py
+++ b/planetstack/xos/settings.py
@@ -1,7 +1,7 @@
 from django.conf.global_settings import TEMPLATE_CONTEXT_PROCESSORS as TCP
 from django import VERSION as DJANGO_VERSION
 
-# Django settings for planetstack project.
+# Django settings for XOS.
 from config import Config
 config = Config()
 
@@ -162,7 +162,7 @@
 # Added for django-suit form 
 TEMPLATE_CONTEXT_PROCESSORS = TCP + (
     'django.core.context_processors.request',
-    'core.context_processors.planetstack',
+    'core.context_processors.xos',
 )
 
 # Django Suit configuration example
@@ -193,7 +193,6 @@
          'core.deploymentrole',
          'core.siterole',
          'core.slicerole',
-         'core.planetstackrole',
          'core.networktemplate',
          'core.networkparametertype',
          'core.router',