From e3ff982eed0f8eaed67049977ea0492e20bb933f Mon Sep 17 00:00:00 2001
From: Nick Sergeant <nick@nicksergeant.com>
Date: Tue, 12 Feb 2013 01:13:22 -0500
Subject: [PATCH] Sorry, only Pros can change account settings.

---
 accounts/templates/account.html | 10 +++++-----
 accounts/urls.py                |  2 +-
 accounts/views.py               |  5 +++++
 blogs/middleware.py             |  2 +-
 snipts/api.py                   |  3 +++
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/accounts/templates/account.html b/accounts/templates/account.html
index 6aa05bc..41c2ab3 100644
--- a/accounts/templates/account.html
+++ b/accounts/templates/account.html
@@ -15,7 +15,7 @@
 {% block content %}
     <section class="profile group" ng-app="Account" ng-controller="MainController">
         <aside>
-            <ul class="nav nav-list">
+            <ul class="nav nav-list ng-cloak" ng-cloak>
                 <li class="nav-header">Account</li>
                 <li ng-class="{active: route.current.scope.section == 'Profile'}">
                     <a href="/account/">Profile</a>
@@ -23,14 +23,14 @@
                 <li>
                     <a href="/password/change/">Change password</a>
                 </li>
-                <li class="nav-header">Pro</li>
-                <li ng-class="{active: route.current.scope.section == 'Blogging'}">
+                <li ng-show="user.is_pro" class="nav-header">Pro</li>
+                <li ng-show="user.is_pro" ng-class="{active: route.current.scope.section == 'Blogging'}">
                     <a href="/account/blogging/">Blogging</a>
                 </li>
-                <li ng-class="{active: route.current.scope.section == 'Editor'}">
+                <li ng-show="user.is_pro" ng-class="{active: route.current.scope.section == 'Editor'}">
                     <a href="/account/editor/">Editor</a>
                 </li>
-                <li ng-class="{active: route.current.scope.section == 'Billing'}">
+                <li ng-show="user.is_pro" ng-class="{active: route.current.scope.section == 'Billing'}">
                     <a href="/account/billing/">Billing</a>
                 </li>
             </ul>
diff --git a/accounts/urls.py b/accounts/urls.py
index e040999..950f0d7 100644
--- a/accounts/urls.py
+++ b/accounts/urls.py
@@ -5,5 +5,5 @@ from accounts import views
 
 urlpatterns = patterns('',
     url(r'^stats/$', views.stats, name='account-stats'),
-    url(r'^', direct_to_template, {'template': 'account.html'}, name='account-detail'),
+    url(r'^', views.account, name='account-detail'),
 )
diff --git a/accounts/views.py b/accounts/views.py
index 6b1111c..a75415c 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -3,6 +3,11 @@ from django.http import HttpResponseRedirect
 from annoying.decorators import render_to
 from snipts.models import Snipt
 
+@login_required
+@render_to('account.html')
+def account(request):
+    return {}
+
 @login_required
 @render_to('stats.html')
 def stats(request):
diff --git a/blogs/middleware.py b/blogs/middleware.py
index cd90fd0..a511f7c 100644
--- a/blogs/middleware.py
+++ b/blogs/middleware.py
@@ -29,6 +29,6 @@ class BlogMiddleware:
                 pro_users = User.objects.filter(userprofile__is_pro=True)
 
                 for pro_user in pro_users:
-                    if pro_user.profile.blog_domain:
+                    if pro_user.profile.blog_domain != '':
                         if host in pro_user.profile.blog_domain.split(' '):
                             request.blog_user = pro_user
diff --git a/snipts/api.py b/snipts/api.py
index c481578..5b78fd9 100644
--- a/snipts/api.py
+++ b/snipts/api.py
@@ -37,6 +37,9 @@ class UserProfileValidation(Validation):
     def is_valid(self, bundle, request=None):
         errors = {}
 
+        if not request.user.profile.is_pro:
+            return 'You must be a Pro to change these settings.'
+
         for field in bundle.data:
             if not re.match('^[ A-Za-z0-9\/\@\._-]*$', bundle.data[field]):
                 errors[field] = 'Only spaces, letters, numbers, underscores, dashes, periods, forward slashes, and "at sign" are valid.'