remove all 'username_repr' stuff

diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index cf71be77d262b5e5091e82d77d70e552ff179154..6b5ce88cfdccda7245eac2d68637d203125b144d 100644 (file)
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -44,7 +44,6 @@ def register(request):
             # Create the user
             entry = request.db.User()
             entry['username'] = request.POST['username'].lower()
-            entry['username_repr'] = request.POST['username']
             entry['email'] = request.POST['email']
             entry['pw_hash'] = auth_lib.bcrypt_gen_password_hash(
                 request.POST['password'])
@@ -64,7 +63,7 @@ def register(request):
                 # example "GNU MediaGoblin @ Wandborg - [...]".   
                 'GNU MediaGoblin - Verify email',
                 email_template.render(
-                    username=entry['username_repr'],
+                    username=entry['username'],
                     verification_url='http://{host}{uri}?userid={userid}&token={verification_key}'.format(
                         host=request.host,
                         uri=request.urlgen('mediagoblin.auth.verify_email'),

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 0b4390d75a58ac983fee5e45a38e2232953f7786..37420834669ea380e48fa113b4537a28328edd70 100644 (file)
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -38,7 +38,6 @@ class User(Document):
 
     structure = {
         'username': unicode,
-        'username_repr': unicode,
         'email': unicode,
         'created': datetime.datetime,
         'plugin_data': dict, # plugins can dump stuff here.
@@ -49,7 +48,7 @@ class User(Document):
         'is_admin': bool,
         }
 
-    required_fields = ['username', 'username_repr', 'created', 'pw_hash', 'email']
+    required_fields = ['username', 'created', 'pw_hash', 'email']
 
     default_values = {
         'created': datetime.datetime.utcnow,

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index df803196e1088f1daf0e8b55a03e220aea50e54a..704e5aa7c70511c87f30a3c3348012a24328ad33 100644 (file)
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -34,7 +34,7 @@
               {% endblock %}{% block mediagoblin_header_title %}{% endblock %}
         <div class="mediagoblin_header_right">
           {% if request.user %}
-                {{ request.user['username_repr'] }}'s account 
+                {{ request.user['username'] }}'s account 
                 (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
           {% else %}
                 <a href="{{ request.urlgen('mediagoblin.auth.login') }}">

diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index b9c98568f2b45b95841dac2f34977ce6c23c6086..2d09f685a8d3208765f43bb75556bdbfe8b842f4 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -26,7 +26,7 @@
 
 {% block mediagoblin_content -%}
   {% if user %}
-    <h1>User page for '{{ user.username_repr }}'</h1>
+    <h1>User page for '{{ user.username }}'</h1>
 
     <ul>