aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mediagoblin/auth/lib.py4
-rw-r--r--mediagoblin/auth/views.py10
-rw-r--r--mediagoblin/db/models.py8
-rw-r--r--mediagoblin/decorators.py2
-rw-r--r--mediagoblin/edit/views.py2
-rw-r--r--mediagoblin/gmg_commands/users.py2
-rw-r--r--mediagoblin/listings/views.py2
-rw-r--r--mediagoblin/submit/views.py2
-rw-r--r--mediagoblin/templates/mediagoblin/base.html6
-rw-r--r--mediagoblin/templates/mediagoblin/edit/edit_profile.html4
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/media.html4
-rw-r--r--mediagoblin/tests/test_submission.py4
-rw-r--r--mediagoblin/tests/test_tests.py2
-rw-r--r--mediagoblin/user_pages/views.py4
14 files changed, 28 insertions, 28 deletions
diff --git a/mediagoblin/auth/lib.py b/mediagoblin/auth/lib.py
index cf4a2b83..ee1ce12d 100644
--- a/mediagoblin/auth/lib.py
+++ b/mediagoblin/auth/lib.py
@@ -105,7 +105,7 @@ def send_verification_email(user, request):
"""
rendered_email = render_template(
request, 'mediagoblin/auth/verification_email.txt',
- {'username': user['username'],
+ {'username': user.username,
'verification_url': EMAIL_VERIFICATION_TEMPLATE.format(
host=request.host,
uri=request.urlgen('mediagoblin.auth.verify_email'),
@@ -140,7 +140,7 @@ def send_fp_verification_email(user, request):
"""
rendered_email = render_template(
request, 'mediagoblin/auth/fp_verification_email.txt',
- {'username': user['username'],
+ {'username': user.username,
'verification_url': EMAIL_FP_VERIFICATION_TEMPLATE.format(
host=request.host,
uri=request.urlgen('mediagoblin.auth.verify_forgot_password'),
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index d01861d1..dab95b17 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -80,7 +80,7 @@ def register(request):
if extra_validation_passes:
# Create the user
user = request.db.User()
- user['username'] = username
+ user.username = username
user['email'] = email
user['pw_hash'] = auth_lib.bcrypt_gen_password_hash(
request.POST['password'])
@@ -98,7 +98,7 @@ def register(request):
# message waiting for them to verify their email
return redirect(
request, 'mediagoblin.user_pages.user_home',
- user=user['username'])
+ user=user.username)
return render_to_response(
request,
@@ -186,7 +186,7 @@ def verify_email(request):
return redirect(
request, 'mediagoblin.user_pages.user_home',
- user=user['username'])
+ user=user.username)
def resend_activation(request):
@@ -224,7 +224,7 @@ def resend_activation(request):
_('Resent your verification email.'))
return redirect(
request, 'mediagoblin.user_pages.user_home',
- user=request.user['username'])
+ user=request.user.username)
def forgot_password(request):
@@ -268,7 +268,7 @@ def forgot_password(request):
return redirect(
request, 'mediagoblin.user_pages.user_home',
- user=user['username'])
+ user=user.username)
# do not reveal whether or not there is a matching user
return redirect(request, 'mediagoblin.auth.fp_email_sent')
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 265fe36d..4af996b8 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -268,12 +268,12 @@ class MediaEntry(Document):
if self.get('slug'):
return urlgen(
'mediagoblin.user_pages.media_home',
- user=uploader['username'],
+ user=uploader.username,
media=self['slug'])
else:
return urlgen(
'mediagoblin.user_pages.media_home',
- user=uploader['username'],
+ user=uploader.username,
media=unicode(self._id))
def url_to_prev(self, urlgen):
@@ -286,7 +286,7 @@ class MediaEntry(Document):
'_id', ASCENDING).limit(1)
if cursor.count():
return urlgen('mediagoblin.user_pages.media_home',
- user=self.get_uploader()['username'],
+ user=self.get_uploader().username,
media=unicode(cursor[0]['slug']))
def url_to_next(self, urlgen):
@@ -300,7 +300,7 @@ class MediaEntry(Document):
if cursor.count():
return urlgen('mediagoblin.user_pages.media_home',
- user=self.get_uploader()['username'],
+ user=self.get_uploader().username,
media=unicode(cursor[0]['slug']))
def get_uploader(self):
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index 269b0c2e..d6a054f8 100644
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -40,7 +40,7 @@ def require_active_login(controller):
request.user.get('status') == u'needs_email_verification':
return redirect(
request, 'mediagoblin.user_pages.user_home',
- user=request.user['username'])
+ user=request.user.username)
elif not request.user or request.user.get('status') != u'active':
return exc.HTTPFound(
location="%s?next=%s" % (
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 673409bd..61a61d4c 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -147,7 +147,7 @@ def edit_attachments(request, media):
def edit_profile(request):
# admins may edit any user profile given a username in the querystring
edit_username = request.GET.get('username')
- if request.user['is_admin'] and request.user['username'] != edit_username:
+ if request.user['is_admin'] and request.user.username != edit_username:
user = request.db.User.find_one({'username': edit_username})
# No need to warn again if admin just submitted an edited profile
if request.method != 'POST':
diff --git a/mediagoblin/gmg_commands/users.py b/mediagoblin/gmg_commands/users.py
index b437e839..e8426272 100644
--- a/mediagoblin/gmg_commands/users.py
+++ b/mediagoblin/gmg_commands/users.py
@@ -50,7 +50,7 @@ def adduser(args):
else:
# Create the user
entry = db.User()
- entry['username'] = unicode(args.username.lower())
+ entry.username = unicode(args.username.lower())
entry['email'] = unicode(args.email)
entry['pw_hash'] = auth_lib.bcrypt_gen_password_hash(args.password)
entry['status'] = u'active'
diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py
index 5a09de43..6b83ffcf 100644
--- a/mediagoblin/listings/views.py
+++ b/mediagoblin/listings/views.py
@@ -86,7 +86,7 @@ def tag_atom_feed(request):
feed.add(entry.get('title'),
entry.get('description_html'),
content_type='html',
- author=entry.get_uploader()['username'],
+ author=entry.get_uploader().username,
updated=entry.get('created'),
url=entry.url_for_self(request.urlgen))
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index 3def44ce..6beb6b18 100644
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -127,7 +127,7 @@ def submit_start(request):
add_message(request, SUCCESS, _('Woohoo! Submitted!'))
return redirect(request, "mediagoblin.user_pages.user_home",
- user=request.user['username'])
+ user=request.user.username)
except InvalidFileType, exc:
submit_form.file.errors.append(
_(u'Invalid file type.'))
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 29639026..c06addd0 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -60,14 +60,14 @@
{# the following link should only appear when verification is needed #}
{% if request.user.status == "needs_email_verification" %}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
- user=request.user['username']) }}"
+ user=request.user.username) }}"
class="button_action_highlight">
{% trans %}Verify your email!{% endtrans %}</a>
{% endif %}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
- user= request.user['username']) }}">
- {{ request.user['username'] }}</a>
+ user= request.user.username) }}">
+ {{ request.user.username }}</a>
(<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>)
{% else %}
diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
index bf8fe5c1..2d5daa95 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_profile.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
@@ -22,11 +22,11 @@
{% block mediagoblin_content %}
<form action="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
- user['username'] }}"
+ user.username }}"
method="POST" enctype="multipart/form-data">
<div class="grid_8 prefix_1 suffix_1 edit_box form_box">
<h1>
- {%- trans username=user['username'] -%}
+ {%- trans username=user.username -%}
Editing {{ username }}'s profile
{%- endtrans %}
</h1>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index b811d161..7fc60c3f 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -80,8 +80,8 @@
{% endautoescape %}
<img src="{{ request.staticdirect('/images/icon_comment.png') }}" />
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
- user = comment_author['username']) }}">
- {{ comment_author['username'] }}</a>
+ user = comment_author.username) }}">
+ {{ comment_author.username }}</a>
{% trans %}at{% endtrans %}
<a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment',
comment = comment._id,
diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py
index 7ea6c4bc..7c372745 100644
--- a/mediagoblin/tests/test_submission.py
+++ b/mediagoblin/tests/test_submission.py
@@ -170,7 +170,7 @@ class TestSubmission:
response = self.test_app.post(
request.urlgen('mediagoblin.user_pages.media_confirm_delete',
# No work: user=media.uploader().username,
- user=self.test_user['username'],
+ user=self.test_user.username,
media=media._id),
# no value means no confirm
{})
@@ -190,7 +190,7 @@ class TestSubmission:
response = self.test_app.post(
request.urlgen('mediagoblin.user_pages.media_confirm_delete',
# No work: user=media.uploader().username,
- user=self.test_user['username'],
+ user=self.test_user.username,
media=media._id),
{'confirm': 'y'})
diff --git a/mediagoblin/tests/test_tests.py b/mediagoblin/tests/test_tests.py
index bc5f9a8d..27098e05 100644
--- a/mediagoblin/tests/test_tests.py
+++ b/mediagoblin/tests/test_tests.py
@@ -27,7 +27,7 @@ def test_get_test_app_wipes_db():
assert mg_globals.database.User.find().count() == 0
new_user = mg_globals.database.User()
- new_user['username'] = u'lolcat'
+ new_user.username = u'lolcat'
new_user['email'] = u'lol@cats.example.org'
new_user['pw_hash'] = u'pretend_this_is_a_hash'
new_user.save()
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 779394c7..ad33479b 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -59,7 +59,7 @@ def user_home(request, page):
user_gallery_url = request.urlgen(
'mediagoblin.user_pages.user_gallery',
- user=user['username'])
+ user=user.username)
return render_to_response(
request,
@@ -173,7 +173,7 @@ def media_confirm_delete(request, media):
if request.method == 'POST' and form.validate():
if form.confirm.data is True:
- username = media.get_uploader()['username']
+ username = media.get_uploader().username
# Delete all files on the public storage
delete_media_files(media)
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-09 01:43:41 +0000