Disable mockups

5 files changed, 16 insertions, 9 deletions

diff --git a/hyperkitty/views/accounts.py b/hyperkitty/views/accounts.py
index b81583f..2c68315 100644
--- a/hyperkitty/views/accounts.py
+++ b/hyperkitty/views/accounts.py
@@ -48,6 +48,7 @@ def user_logout(request):
 
 def user_login(request, template='login.html'):
 
+    user = None
     parse_r = urlparse(request.META.get('HTTP_REFERER', 'index'))
     previous = '%s%s' % (parse_r.path, parse_r.query)
 
diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py
index e4a69bd..21a983e 100644
--- a/hyperkitty/views/list.py
+++ b/hyperkitty/views/list.py
@@ -18,7 +18,7 @@ from django.contrib.auth.decorators import (login_required,
                                             user_passes_test)
 
 from hyperkitty.models import Rating, Tag
-from hyperkitty.lib.mockup import *
+#from hyperkitty.lib.mockup import *
 from hyperkitty.lib import ThreadSafeStorePool
 from forms import *
 from hyperkitty.utils import log
@@ -211,9 +211,12 @@ def list(request, mlist_fqdn=None):
 
     # top authors are the ones that have the most kudos.  How do we determine
     # that?  Most likes for their post?
-    authors = generate_top_author()
-    authors = sorted(authors, key=lambda author: author.kudos)
-    authors.reverse()
+    if settings.USE_MOCKUPS:
+        authors = generate_top_author()
+        authors = sorted(authors, key=lambda author: author.kudos)
+        authors.reverse()
+    else:
+        authors = []
 
     # Get the list activity per day
     days = dates.keys()
@@ -226,7 +229,11 @@ def list(request, mlist_fqdn=None):
         evolution.append(0)
 
     # threads per category is the top thread titles in each category
-    threads_per_category = generate_thread_per_category()
+    if settings.USE_MOCKUPS:
+        threads_per_category = generate_thread_per_category()
+    else:
+        threads_per_category = {}
+
     c = RequestContext(request, {
         'list_name' : list_name,
         'list_address': mlist_fqdn,
diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py
index 89e1489..089de81 100644
--- a/hyperkitty/views/message.py
+++ b/hyperkitty/views/message.py
@@ -12,7 +12,7 @@ from django.contrib.auth.decorators import (login_required,
 
 from hyperkitty.models import Rating
 from hyperkitty.lib import ThreadSafeStorePool
-from hyperkitty.lib.mockup import *
+#from hyperkitty.lib.mockup import *
 from forms import *
 from hyperkitty.utils import log
 
diff --git a/hyperkitty/views/pages.py b/hyperkitty/views/pages.py
index e8a5bd1..29945b4 100644
--- a/hyperkitty/views/pages.py
+++ b/hyperkitty/views/pages.py
@@ -18,7 +18,7 @@ from django.contrib.auth.decorators import (login_required,
                                             permission_required,
                                             user_passes_test)
 from hyperkitty.models import Rating
-from hyperkitty.lib.mockup import *
+#from hyperkitty.lib.mockup import *
 from hyperkitty.lib import ThreadSafeStorePool
 from forms import *
 from hyperkitty.utils import log
@@ -32,7 +32,6 @@ def index(request):
 
     store = ThreadSafeStorePool().get()
     list_data = store.get_list_names()
-    print list_data
     log("warn", repr(list_data))
 
     c = RequestContext(request, {
diff --git a/hyperkitty/views/thread.py b/hyperkitty/views/thread.py
index 7d78885..8da41b7 100644
--- a/hyperkitty/views/thread.py
+++ b/hyperkitty/views/thread.py
@@ -9,7 +9,7 @@ from django.contrib.auth.decorators import (login_required,
                                             user_passes_test)
 
 from hyperkitty.models import Rating, Tag
-from hyperkitty.lib.mockup import *
+#from hyperkitty.lib.mockup import *
 from forms import *
 from hyperkitty.utils import log