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

Dot-Notation for MediaEntry.uploader

Browse Source
This commit is contained in:
Elrond 2011-11-21 20:18:38 +01:00
parent 0547843020
commit 1ceb4fc868
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/db/models.py
View File

@ -281,7 +281,7 @@ class MediaEntry(Document):
Provide a url to the previous entry from this user, if there is one Provide a url to the previous entry from this user, if there is one
""" """
cursor = self.db.MediaEntry.find({'_id': {"$gt": self._id}, cursor = self.db.MediaEntry.find({'_id': {"$gt": self._id},
'uploader': self['uploader'], 'uploader': self.uploader,
'state': 'processed'}).sort( 'state': 'processed'}).sort(
'_id', ASCENDING).limit(1) '_id', ASCENDING).limit(1)
if cursor.count(): if cursor.count():
@ -294,7 +294,7 @@ class MediaEntry(Document):
Provide a url to the next entry from this user, if there is one Provide a url to the next entry from this user, if there is one
""" """
cursor = self.db.MediaEntry.find({'_id': {"$lt": self._id}, cursor = self.db.MediaEntry.find({'_id': {"$lt": self._id},
'uploader': self['uploader'], 'uploader': self.uploader,
'state': 'processed'}).sort( 'state': 'processed'}).sort(
'_id', DESCENDING).limit(1) '_id', DESCENDING).limit(1)
@ -304,7 +304,7 @@ class MediaEntry(Document):
media=unicode(cursor[0]['slug'])) media=unicode(cursor[0]['slug']))
def get_uploader(self): def get_uploader(self):
return self.db.User.find_one({'_id': self['uploader']}) return self.db.User.find_one({'_id': self.uploader})
def get_fail_exception(self): def get_fail_exception(self):
""" """

2
mediagoblin/edit/lib.py
View File

@ -17,7 +17,7 @@
def may_edit_media(request, media): def may_edit_media(request, media):
"""Check, if the request's user may edit the media details""" """Check, if the request's user may edit the media details"""
if media['uploader'] == request.user._id: if media.uploader == request.user._id:
return True return True
if request.user.is_admin: if request.user.is_admin:
return True return True

4
mediagoblin/edit/views.py
View File

@ -57,7 +57,7 @@ def edit_media(request, media):
# and userid. # and userid.
existing_user_slug_entries = request.db.MediaEntry.find( existing_user_slug_entries = request.db.MediaEntry.find(
{'slug': request.POST['slug'], {'slug': request.POST['slug'],
'uploader': media['uploader'], 'uploader': media.uploader,
'_id': {'$ne': media._id}}).count() '_id': {'$ne': media._id}}).count()
if existing_user_slug_entries: if existing_user_slug_entries:
@ -79,7 +79,7 @@ def edit_media(request, media):
location=media.url_for_self(request.urlgen)) location=media.url_for_self(request.urlgen))
if request.user.is_admin \ if request.user.is_admin \
and media['uploader'] != request.user._id \ and media.uploader != request.user._id \
and request.method != 'POST': and request.method != 'POST':
messages.add_message( messages.add_message(
request, messages.WARNING, request, messages.WARNING,

2
mediagoblin/submit/views.py
View File

@ -64,7 +64,7 @@ def submit_start(request):
entry['description_html'] = cleaned_markdown_conversion( entry['description_html'] = cleaned_markdown_conversion(
entry['description']) entry['description'])
entry['uploader'] = request.user['_id'] entry.uploader = request.user._id
# Process the user's folksonomy "tags" # Process the user's folksonomy "tags"
entry['tags'] = convert_to_tag_list_of_dicts( entry['tags'] = convert_to_tag_list_of_dicts(

4
mediagoblin/templates/mediagoblin/user_pages/media.html
View File

@ -115,7 +115,7 @@
<div class="grid_5 omega"> <div class="grid_5 omega">
{% include "mediagoblin/utils/prev_next.html" %} {% include "mediagoblin/utils/prev_next.html" %}
{% if media['uploader'] == request.user._id or {% if media.uploader == request.user._id or
request.user.is_admin %} request.user.is_admin %}
<p> <p>
{% set edit_url = request.urlgen('mediagoblin.edit.edit_media', {% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
@ -145,7 +145,7 @@
{% endif %} {% endif %}
{% if app_config['allow_attachments'] {% if app_config['allow_attachments']
and (media['uploader'] == request.user._id and (media.uploader == request.user._id
or request.user.is_admin) %} or request.user.is_admin) %}
<p> <p>
<a href="{{ request.urlgen('mediagoblin.edit.attachments', <a href="{{ request.urlgen('mediagoblin.edit.attachments',