From af008743ca89a3f3634efa31718a65ea8adbc2fd Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Fri, 21 Dec 2012 11:25:38 +0100 Subject: Remove mongolisms from user_pages.view #451 --- mediagoblin/user_pages/routing.py | 1 + 1 file changed, 1 insertion(+) (limited to 'mediagoblin/user_pages/routing.py') diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 8162e641..22d7f9b8 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -27,6 +27,7 @@ add_route('mediagoblin.user_pages.media_confirm_delete', '/u//m//confirm-delete/', 'mediagoblin.user_pages.views:media_confirm_delete') +# Submission handling of new comments. TODO: only allow for POST methods add_route('mediagoblin.user_pages.media_post_comment', '/u//m//comment/add/', 'mediagoblin.user_pages.views:media_post_comment') -- cgit v1.2.3 From 3d9143323019e0793451eac60eef8e55c09f6c47 Mon Sep 17 00:00:00 2001 From: Elrond Date: Sun, 16 Dec 2012 00:50:20 +0100 Subject: Move things from routing.py to tools/routing.py This stops a cyclic import. Move add_route, mount and endpoint_to_controller into tools/routing.py and change all callers. --- mediagoblin/user_pages/routing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/user_pages/routing.py') diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 22d7f9b8..63bf5c2a 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from mediagoblin.routing import add_route +from mediagoblin.tools.routing import add_route add_route('mediagoblin.user_pages.user_home', '/u//', 'mediagoblin.user_pages.views:user_home') -- cgit v1.2.3 From 461dd9717cce6c5b4d40bb4e76ca65d9d898d1df Mon Sep 17 00:00:00 2001 From: Elrond Date: Fri, 11 Jan 2013 14:18:27 +0100 Subject: Start to use the media_id in "admin" URLs. We have a bunch of URLs that are more for internal use. At least they're definitely not intended to be posted somewhere for long term useage. When those things affect a media, it's much better to reference the media by its id. This can't change, ever. This is better for races. Like someone posting a comment while the owner corrects a typo in the slug. --- mediagoblin/user_pages/routing.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mediagoblin/user_pages/routing.py') diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 63bf5c2a..d36e7598 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -24,12 +24,12 @@ add_route('mediagoblin.user_pages.media_home', 'mediagoblin.user_pages.views:media_home') add_route('mediagoblin.user_pages.media_confirm_delete', - '/u//m//confirm-delete/', + '/u//m//confirm-delete/', 'mediagoblin.user_pages.views:media_confirm_delete') # Submission handling of new comments. TODO: only allow for POST methods add_route('mediagoblin.user_pages.media_post_comment', - '/u//m//comment/add/', + '/u//m//comment/add/', 'mediagoblin.user_pages.views:media_post_comment') add_route('mediagoblin.user_pages.user_gallery', @@ -74,7 +74,7 @@ add_route('mediagoblin.user_pages.processing_panel', # Stray edit routes add_route('mediagoblin.edit.edit_media', - '/u//m//edit/', + '/u//m//edit/', 'mediagoblin.edit.views:edit_media') add_route('mediagoblin.edit.attachments', -- cgit v1.2.3 From b0cc1ade404417a3b4c005ac4e11d5f71ac0c988 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Tue, 18 Dec 2012 12:34:30 +0100 Subject: collections: add support to browse existing collections - add a route at /u//collections/ (note trailing 's') that lists all existing collections - move there the "Create new collection" link, if the user is logged in - add a new link "Browse collections" from root.html --- mediagoblin/user_pages/routing.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mediagoblin/user_pages/routing.py') diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 63bf5c2a..50243a2b 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -48,6 +48,10 @@ add_route('mediagoblin.user_pages.media_collect', '/u//m//collect/', 'mediagoblin.user_pages.views:media_collect') +add_route('mediagoblin.user_pages.user_collections', + '/u//collections/', + 'mediagoblin.user_pages.views:user_collections') + add_route('mediagoblin.user_pages.user_collection', '/u//collection//', 'mediagoblin.user_pages.views:user_collection') -- cgit v1.2.3 From 4f8f0353b191c71dfa876b12621c573f98e10d1d Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Tue, 15 Jan 2013 23:11:33 +0100 Subject: collection browsing: rename view/template user_collections -> collection_list Rationale, avoid confusion between views user_collection and user_collections (note trailing "s"). Ditto for the collection(s).html templates. --- mediagoblin/user_pages/routing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mediagoblin/user_pages/routing.py') diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 50243a2b..24bbab56 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -48,9 +48,9 @@ add_route('mediagoblin.user_pages.media_collect', '/u//m//collect/', 'mediagoblin.user_pages.views:media_collect') -add_route('mediagoblin.user_pages.user_collections', +add_route('mediagoblin.user_pages.collection_list', '/u//collections/', - 'mediagoblin.user_pages.views:user_collections') + 'mediagoblin.user_pages.views:collection_list') add_route('mediagoblin.user_pages.user_collection', '/u//collection//', -- cgit v1.2.3 From 7d16a01baea3251aaecf1aaba519b6549fcf0b5f Mon Sep 17 00:00:00 2001 From: Elrond Date: Thu, 17 Jan 2013 23:50:51 +0100 Subject: Fix linking to comments. when linking to a comment in a MediaEntry, the page did not contain a because, well: We fetched a string comment-id from the routing. And the pagination code tried to compare that to the int id on the comment. Fix is to let routing fetch an int from the url. Easy. Relatedly remove duplicated comment_id fetching from the URL in the view. --- mediagoblin/user_pages/routing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/user_pages/routing.py') diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index a9431405..2b228355 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -37,7 +37,7 @@ add_route('mediagoblin.user_pages.user_gallery', 'mediagoblin.user_pages.views:user_gallery') add_route('mediagoblin.user_pages.media_home.view_comment', - '/u//m//c//', + '/u//m//c//', 'mediagoblin.user_pages.views:media_home') add_route('mediagoblin.user_pages.atom_feed', -- cgit v1.2.3 From f2c0bf3e34f1b56908444fc11504bb0114d0e0a3 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 4 Dec 2012 16:38:46 +0100 Subject: Implement user's tag filtered gallery page tags used to be global, you could only browse media by tag for all users. This patch implements a view that allows us to browse only a user's tagged media. Signed-off-by: Sebastian Spaeth --- mediagoblin/user_pages/routing.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mediagoblin/user_pages/routing.py') diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 2b228355..a8a2eba7 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -40,6 +40,11 @@ add_route('mediagoblin.user_pages.media_home.view_comment', '/u//m//c//', 'mediagoblin.user_pages.views:media_home') +# User's tags gallery +add_route('mediagoblin.user_pages.user_gallery', + '/u//tag//', + 'mediagoblin.user_pages.views:user_gallery') + add_route('mediagoblin.user_pages.atom_feed', '/u//atom/', 'mediagoblin.user_pages.views:atom_feed') -- cgit v1.2.3 From 631784a2d793119c17d0cb5f656db1eb515add56 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 21 Feb 2013 16:19:43 -0600 Subject: Making the tags on media pages point to the user's tag listing specifically. This commit sponsored by Torsten Meissner. Thanks, Torsten! --- mediagoblin/user_pages/routing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/user_pages/routing.py') diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index a8a2eba7..6ea3c3e2 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -41,7 +41,7 @@ add_route('mediagoblin.user_pages.media_home.view_comment', 'mediagoblin.user_pages.views:media_home') # User's tags gallery -add_route('mediagoblin.user_pages.user_gallery', +add_route('mediagoblin.user_pages.user_tag_gallery', '/u//tag//', 'mediagoblin.user_pages.views:user_gallery') -- cgit v1.2.3 From 954b407cf8386f3c40ce1f51c2c7f321075b0fe6 Mon Sep 17 00:00:00 2001 From: Elrond Date: Sun, 24 Feb 2013 11:30:17 +0100 Subject: Use the media id for attachmemt editing. And remove some stray white space from the output. --- mediagoblin/user_pages/routing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/user_pages/routing.py') diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 6ea3c3e2..7de3ab60 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -87,5 +87,5 @@ add_route('mediagoblin.edit.edit_media', 'mediagoblin.edit.views:edit_media') add_route('mediagoblin.edit.attachments', - '/u//m//attachments/', + '/u//m//attachments/', 'mediagoblin.edit.views:edit_attachments') -- cgit v1.2.3 From 96a2249bc01ba67ee4487703f1b8757d9e6e77e7 Mon Sep 17 00:00:00 2001 From: Elrond Date: Sun, 24 Feb 2013 16:08:55 +0100 Subject: Use media.id for collecting media too. Also remove some useless whitespace while at it. --- mediagoblin/user_pages/routing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/user_pages/routing.py') diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 7de3ab60..9cb665b5 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -50,7 +50,7 @@ add_route('mediagoblin.user_pages.atom_feed', 'mediagoblin.user_pages.views:atom_feed') add_route('mediagoblin.user_pages.media_collect', - '/u//m//collect/', + '/u//m//collect/', 'mediagoblin.user_pages.views:media_collect') add_route('mediagoblin.user_pages.collection_list', -- cgit v1.2.3