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

Rename MediaEntry.uploader() to .get_uploader()

Browse Source 
The .uploader() method conflicts with the uploader database
field. As we're moving to .FIELD for db field access, this
is a relevant conflict.

So renaming .uploader() to .get_uploader()
This commit is contained in:
Elrond 2011-11-21 21:40:48 +01:00
parent 4d4e5b435b
commit 3018832153
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mediagoblin/db/models.py
View File

@ -263,7 +263,7 @@ class MediaEntry(Document):
Use a slug if we have one, else use our '_id'.
"""
uploader = self.uploader()
uploader = self.get_uploader()
if self.get('slug'):
return urlgen(
@ -286,7 +286,7 @@ class MediaEntry(Document):
'_id', ASCENDING).limit(1)
if cursor.count():
return urlgen('mediagoblin.user_pages.media_home',
user=self.uploader()['username'],
user=self.get_uploader()['username'],
media=unicode(cursor[0]['slug']))
def url_to_next(self, urlgen):
@ -300,10 +300,10 @@ class MediaEntry(Document):
if cursor.count():
return urlgen('mediagoblin.user_pages.media_home',
user=self.uploader()['username'],
user=self.get_uploader()['username'],
media=unicode(cursor[0]['slug']))
def uploader(self):
def get_uploader(self):
return self.db.User.find_one({'_id': self['uploader']})
def get_fail_exception(self):

2
mediagoblin/decorators.py
View File

@ -58,7 +58,7 @@ def user_may_delete_media(controller):
"""
def wrapper(request, *args, **kwargs):
uploader = request.db.MediaEntry.find_one(
{'_id': ObjectId(request.matchdict['media'])}).uploader()
{'_id': ObjectId(request.matchdict['media'])}).get_uploader()
if not (request.user['is_admin'] or
request.user._id == uploader._id):
return exc.HTTPForbidden()

2
mediagoblin/listings/views.py
View File

@ -86,7 +86,7 @@ def tag_atom_feed(request):
feed.add(entry.get('title'),
entry.get('description_html'),
content_type='html',
author=entry.uploader()['username'],
author=entry.get_uploader()['username'],
updated=entry.get('created'),
url=entry.url_for_self(request.urlgen))

2
mediagoblin/templates/mediagoblin/edit/attachments.html
View File

@ -20,7 +20,7 @@
{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
{% block mediagoblin_content %}
<form action="{{ request.urlgen('mediagoblin.edit.attachments',
user= media.uploader().username,
user= media.get_uploader().username,
media= media._id) }}"
method="POST" enctype="multipart/form-data">
<div class="grid_8 prefix_1 suffix_1 edit_box form_box">

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

@ -22,7 +22,7 @@
{% block mediagoblin_content %}
<form action="{{ request.urlgen('mediagoblin.edit.edit_media',
user= media.uploader().username,
user= media.get_uploader().username,
media= media._id) }}"
method="POST" enctype="multipart/form-data">
<div class="grid_8 prefix_1 suffix_1 edit_box form_box">

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

@ -56,8 +56,8 @@
{% trans date=media.created.strftime("%Y-%m-%d"),
user_url=request.urlgen(
'mediagoblin.user_pages.user_home',
user=media.uploader().username),
username=media.uploader().username -%}
user=media.get_uploader().username),
username=media.get_uploader().username -%}
By <a href="{{ user_url }}">{{ username }}</a> on {{ date }}
{%- endtrans %}
</p>
@ -84,7 +84,7 @@
{% trans %}at{% endtrans %}
<a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment',
comment = comment._id,
user = media.uploader().username,
user = media.get_uploader().username,
media = media._id) }}#comment">
{{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
</a>
@ -94,7 +94,7 @@
{% if request.user %}
<form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment',
user= media.uploader().username,
user= media.get_uploader().username,
media=media._id) }}" method="POST">
{{ wtforms_util.render_divs(comment_form) }}
<div class="form_submit_buttons">
@ -106,7 +106,7 @@
{{ render_pagination(request, pagination,
request.urlgen('mediagoblin.user_pages.media_home',
user = media.uploader().username,
user = media.get_uploader().username,
media = media._id)) }}
</div>
{% endif %}
@ -118,13 +118,13 @@
request.user['is_admin'] %}
<p>
{% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
user= media.uploader().username,
user= media.get_uploader().username,
media= media._id) %}
<a href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a>
</p>
<p>
{% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
user= media.uploader().username,
user= media.get_uploader().username,
media= media._id) %}
<a href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
</p>
@ -148,7 +148,7 @@
or request.user['is_admin']) %}
<p>
<a href="{{ request.urlgen('mediagoblin.edit.attachments',
user=media.uploader().username,
user=media.get_uploader().username,
media=media._id) }}">Add attachment</a>
</p>
{% endif %}

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

@ -22,7 +22,7 @@
{% block mediagoblin_content %}
<form action="{{ request.urlgen('mediagoblin.user_pages.media_confirm_delete',
user=media.uploader().username,
user=media.get_uploader().username,
media=media._id) }}"
method="POST" enctype="multipart/form-data">
<div class="grid_8 prefix_1 suffix_1 edit_box form_box">

4
mediagoblin/user_pages/views.py
View File

@ -169,7 +169,7 @@ def media_confirm_delete(request, media):
if request.method == 'POST' and form.validate():
if form.confirm.data is True:
username = media.uploader()['username']
username = media.get_uploader()['username']
# Delete all files on the public storage
delete_media_files(media)
@ -188,7 +188,7 @@ def media_confirm_delete(request, media):
location=media.url_for_self(request.urlgen))
if ((request.user[u'is_admin'] and
request.user._id != media.uploader()._id)):
request.user._id != media.get_uploader()._id)):
messages.add_message(
request, messages.WARNING,
_("You are about to delete another user's media. "