diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-12-12 18:53:03 +0100 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-12-12 18:53:03 +0100 |
| commit | d44140a212fddab3301cbf3a97d3197f8879277b (patch) | |
| tree | edc8f09b0e476fc78472b469fdda6adda33b4dc2 /mediagoblin/user_pages | |
| parent | 6ae878e730e006ab674f12c581af8447a0994a9f (diff) | |
| parent | ddc1cae9ea4c80415557ec0408a56a3a1c60423b (diff) | |
| download | mediagoblin-d44140a212fddab3301cbf3a97d3197f8879277b.tar.lz mediagoblin-d44140a212fddab3301cbf3a97d3197f8879277b.tar.xz mediagoblin-d44140a212fddab3301cbf3a97d3197f8879277b.zip | |
Merge branch 'sql/dot-notation'
* sql/dot-notation:
Dot-Notation for MediaEntry.media_data
Dot-Notation for MediaEntry.media_type
Dot-Notation for MediaEntry.description(_html)
Dot-Notation for MediaEntry.slug
Dot-Notation for MediaEntry.title
Dot-Notation for MediaEntry.uploader
Dot-Notation for MediaEntry.created
Dot-Notation: tests/test_edit.py
Dot-Notation for Users.fp_token_expire
Dot-Notation for Users.fp_verification_key
Dot-Notation for Users.bio and .bio_html
Dot-Notation for Users.url
Dot-Notation for Users.is_admin
Dot-Notation for Users.verification_key
Dot-Notation for Users.status
Dot-Notation for Users.email_verified
Dot-Notation for Users.pw_hash
Dot-Notation for Users.email
Dot-Notation for Users.username
Diffstat (limited to 'mediagoblin/user_pages')
| -rw-r--r-- | mediagoblin/user_pages/views.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 779394c7..87b82c74 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -40,7 +40,7 @@ def user_home(request, page): 'username': request.matchdict['user']}) if not user: return render_404(request) - elif user['status'] != u'active': + elif user.status != u'active': return render_to_response( request, 'mediagoblin/user_pages/user.html', @@ -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, @@ -122,7 +122,7 @@ def media_home(request, media, page, **kwargs): comment_form = user_forms.MediaCommentForm(request.POST) - media_template_name = get_media_manager(media['media_type'])['display_template'] + media_template_name = get_media_manager(media.media_type)['display_template'] 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) @@ -191,7 +191,7 @@ def media_confirm_delete(request, media): return exc.HTTPFound( location=media.url_for_self(request.urlgen)) - if ((request.user[u'is_admin'] and + if ((request.user.is_admin and request.user._id != media.get_uploader()._id)): messages.add_message( request, messages.WARNING, @@ -254,7 +254,7 @@ def processing_panel(request): # Make sure the user exists and is active if not user: return render_404(request) - elif user['status'] != u'active': + elif user.status != u'active': return render_to_response( request, 'mediagoblin/user_pages/user.html', |