diff options
Diffstat (limited to 'mediagoblin/user_pages')
| -rw-r--r-- | mediagoblin/user_pages/routing.py | 110 | ||||
| -rw-r--r-- | mediagoblin/user_pages/views.py | 22 |
2 files changed, 76 insertions, 56 deletions
diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 1cfce2dd..8162e641 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -14,48 +14,68 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from routes.route import Route - -user_routes = [ - Route('mediagoblin.user_pages.user_home', "/{user}/", - controller="mediagoblin.user_pages.views:user_home"), - Route('mediagoblin.user_pages.user_gallery', "/{user}/gallery/", - controller="mediagoblin.user_pages.views:user_gallery"), - Route('mediagoblin.user_pages.media_home', '/{user}/m/{media}/', - requirements=dict(m_id="[0-9a-fA-F]{24}"), - controller="mediagoblin.user_pages.views:media_home"), - Route('mediagoblin.user_pages.media_home.view_comment', - '/{user}/m/{media}/c/{comment}/', - controller="mediagoblin.user_pages.views:media_home"), - Route('mediagoblin.edit.edit_media', "/{user}/m/{media}/edit/", - controller="mediagoblin.edit.views:edit_media"), - Route('mediagoblin.edit.attachments', - '/{user}/m/{media}/attachments/', - controller="mediagoblin.edit.views:edit_attachments"), - Route('mediagoblin.user_pages.media_confirm_delete', - "/{user}/m/{media}/confirm-delete/", - controller="mediagoblin.user_pages.views:media_confirm_delete"), - Route('mediagoblin.user_pages.atom_feed', '/{user}/atom/', - controller="mediagoblin.user_pages.views:atom_feed"), - Route('mediagoblin.user_pages.media_post_comment', - '/{user}/m/{media}/comment/add/', - controller="mediagoblin.user_pages.views:media_post_comment"), - Route('mediagoblin.user_pages.media_collect', - "/{user}/m/{media}/collect/", - controller="mediagoblin.user_pages.views:media_collect"), - Route('mediagoblin.user_pages.user_collection', "/{user}/collection/{collection}/", - controller="mediagoblin.user_pages.views:user_collection"), - Route('mediagoblin.edit.edit_collection', "/{user}/c/{collection}/edit/", - controller="mediagoblin.edit.views:edit_collection"), - Route('mediagoblin.user_pages.collection_confirm_delete', - "/{user}/c/{collection}/confirm-delete/", - controller="mediagoblin.user_pages.views:collection_confirm_delete"), - Route('mediagoblin.user_pages.collection_item_confirm_remove', - "/{user}/collection/{collection}/{collection_item}/confirm_remove/", - controller="mediagoblin.user_pages.views:collection_item_confirm_remove"), - Route('mediagoblin.user_pages.collection_atom_feed', '/{user}/collection/{collection}/atom/', - controller="mediagoblin.user_pages.views:collection_atom_feed"), - Route('mediagoblin.user_pages.processing_panel', - '/{user}/panel/', - controller="mediagoblin.user_pages.views:processing_panel"), - ] +from mediagoblin.routing import add_route + +add_route('mediagoblin.user_pages.user_home', + '/u/<string:user>/', 'mediagoblin.user_pages.views:user_home') + +add_route('mediagoblin.user_pages.media_home', + '/u/<string:user>/m/<string:media>/', + 'mediagoblin.user_pages.views:media_home') + +add_route('mediagoblin.user_pages.media_confirm_delete', + '/u/<string:user>/m/<string:media>/confirm-delete/', + 'mediagoblin.user_pages.views:media_confirm_delete') + +add_route('mediagoblin.user_pages.media_post_comment', + '/u/<string:user>/m/<string:media>/comment/add/', + 'mediagoblin.user_pages.views:media_post_comment') + +add_route('mediagoblin.user_pages.user_gallery', + '/u/<string:user>/gallery/', + 'mediagoblin.user_pages.views:user_gallery') + +add_route('mediagoblin.user_pages.media_home.view_comment', + '/u/<string:user>/m/<string:media>/c/<string:comment>/', + 'mediagoblin.user_pages.views:media_home') + +add_route('mediagoblin.user_pages.atom_feed', + '/u/<string:user>/atom/', + 'mediagoblin.user_pages.views:atom_feed') + +add_route('mediagoblin.user_pages.media_collect', + '/u/<string:user>/m/<string:media>/collect/', + 'mediagoblin.user_pages.views:media_collect') + +add_route('mediagoblin.user_pages.user_collection', + '/u/<string:user>/collection/<string:collection>/', + 'mediagoblin.user_pages.views:user_collection') + +add_route('mediagoblin.edit.edit_collection', + '/u/<string:user>/c/<string:collection>/edit/', + 'mediagoblin.edit.views:edit_collection') + +add_route('mediagoblin.user_pages.collection_confirm_delete', + '/u/<string:user>/c/<string:collection>/confirm-delete/', + 'mediagoblin.user_pages.views:collection_confirm_delete') + +add_route('mediagoblin.user_pages.collection_item_confirm_remove', + '/u/<string:user>/collection/<string:collection>/<string:collection_item>/confirm_remove/', + 'mediagoblin.user_pages.views:collection_item_confirm_remove') + +add_route('mediagoblin.user_pages.collection_atom_feed', + '/u/<string:user>/collection/<string:collection>/atom/', + 'mediagoblin.user_pages.views:collection_atom_feed') + +add_route('mediagoblin.user_pages.processing_panel', + '/u/<string:user>/panel/', + 'mediagoblin.user_pages.views:processing_panel') + +# Stray edit routes +add_route('mediagoblin.edit.edit_media', + '/u/<string:user>/m/<string:media>/edit/', + 'mediagoblin.edit.views:edit_media') + +add_route('mediagoblin.edit.attachments', + '/u/<string:user>/m/<string:media>/attachments/', + 'mediagoblin.edit.views:edit_attachments') diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index e5131b02..c26bd340 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -126,7 +126,7 @@ def media_home(request, media, page, **kwargs): comments = pagination() - comment_form = user_forms.MediaCommentForm(request.POST) + comment_form = user_forms.MediaCommentForm(request.form) media_template_name = get_media_manager( media.media_type)['display_template'] @@ -152,7 +152,7 @@ def media_post_comment(request, media): comment = request.db.MediaComment() comment.media_entry = media.id comment.author = request.user.id - comment.content = unicode(request.POST['comment_content']) + comment.content = unicode(request.form['comment_content']) if not comment.content.strip(): messages.add_message( @@ -180,7 +180,7 @@ def media_post_comment(request, media): @require_active_login def media_collect(request, media): - form = user_forms.MediaCollectForm(request.POST) + form = user_forms.MediaCollectForm(request.form) filt = (request.db.Collection.creator == request.user.id) form.collection.query = request.db.Collection.query.filter( filt).order_by(request.db.Collection.title) @@ -192,15 +192,15 @@ def media_collect(request, media): collection_item = request.db.CollectionItem() # If the user is adding a new collection, use that - if request.POST['collection_title']: + if request.form['collection_title']: collection = request.db.Collection() collection.id = ObjectId() collection.title = ( - unicode(request.POST['collection_title'])) + unicode(request.form['collection_title'])) collection.description = unicode( - request.POST.get('collection_description')) + request.form.get('collection_description')) collection.creator = request.user._id collection.generate_slug() @@ -225,7 +225,7 @@ def media_collect(request, media): # Otherwise, use the collection selected from the drop-down else: collection = request.db.Collection.find_one({ - '_id': request.POST.get('collection')}) + '_id': request.form.get('collection')}) collection_item.collection = collection.id # Make sure the user actually selected a collection @@ -244,7 +244,7 @@ def media_collect(request, media): else: collection_item.media_entry = media.id collection_item.author = request.user.id - collection_item.note = unicode(request.POST['note']) + collection_item.note = unicode(request.form['note']) collection_item.save(validate=True) collection.items = collection.items + 1 @@ -277,7 +277,7 @@ def media_collect(request, media): @user_may_delete_media def media_confirm_delete(request, media): - form = user_forms.ConfirmDeleteForm(request.POST) + form = user_forms.ConfirmDeleteForm(request.form) if request.method == 'POST' and form.validate(): if form.confirm.data is True: @@ -360,7 +360,7 @@ def user_collection(request, page): @user_may_alter_collection def collection_item_confirm_remove(request, collection_item): - form = user_forms.ConfirmCollectionItemRemoveForm(request.POST) + form = user_forms.ConfirmCollectionItemRemoveForm(request.form) if request.method == 'POST' and form.validate(): username = collection_item.in_collection.get_creator.username @@ -405,7 +405,7 @@ def collection_item_confirm_remove(request, collection_item): @user_may_alter_collection def collection_confirm_delete(request, collection): - form = user_forms.ConfirmDeleteForm(request.POST) + form = user_forms.ConfirmDeleteForm(request.form) if request.method == 'POST' and form.validate(): |