heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove all 'username_repr' stuff

Browse Source
This commit is contained in:
Jakob Kramer 2011-05-29 19:49:25 +02:00
parent ff6b9f7279
commit db5912e358
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/auth/views.py
View File

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

3
mediagoblin/db/models.py
View File

@ -38,7 +38,6 @@ class User(Document):
structure = { structure = {
'username': unicode, 'username': unicode,
'username_repr': unicode,
'email': unicode, 'email': unicode,
'created': datetime.datetime, 'created': datetime.datetime,
'plugin_data': dict, # plugins can dump stuff here. 'plugin_data': dict, # plugins can dump stuff here.
@ -49,7 +48,7 @@ class User(Document):
'is_admin': bool, 'is_admin': bool,
} }
required_fields = ['username', 'username_repr', 'created', 'pw_hash', 'email'] required_fields = ['username', 'created', 'pw_hash', 'email']
default_values = { default_values = {
'created': datetime.datetime.utcnow, 'created': datetime.datetime.utcnow,

2
mediagoblin/templates/mediagoblin/base.html
View File

@ -34,7 +34,7 @@
{% endblock %}{% block mediagoblin_header_title %}{% endblock %} {% endblock %}{% block mediagoblin_header_title %}{% endblock %}
<div class="mediagoblin_header_right"> <div class="mediagoblin_header_right">
{% if request.user %} {% if request.user %}
{{ request.user['username_repr'] }}'s account {{ request.user['username'] }}'s account
(<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>) (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
{% else %} {% else %}
<a href="{{ request.urlgen('mediagoblin.auth.login') }}"> <a href="{{ request.urlgen('mediagoblin.auth.login') }}">

2
mediagoblin/templates/mediagoblin/user_pages/user.html
View File

@ -26,7 +26,7 @@
{% block mediagoblin_content -%} {% block mediagoblin_content -%}
{% if user %} {% if user %}
<h1>User page for '{{ user.username_repr }}'</h1> <h1>User page for '{{ user.username }}'</h1>
<ul> <ul>