From 49745d5138540af8f7cbce318767172f4c560881 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <mail@jefvanschendel.nl>
Date: Thu, 17 Jan 2013 20:04:22 +0100
Subject: [PATCH 1/4] Add "Browse collections" link to profile pages

---
 mediagoblin/templates/mediagoblin/user_pages/user.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index 76bce1e2..71acd66c 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -118,6 +118,12 @@
           </a>
         {% endif %}
     {% endif %}
+      <p>
+        <a href="{{ request.urlgen('mediagoblin.user_pages.collection_list',
+                                           user=user.username) }}">
+          {%- trans %}Browse collections{% endtrans -%}
+        </a>
+      </p>
     </div>
 
     {% if media_entries.count() %}

From 9d8285864aacda5f321e473f4d9298a183f41645 Mon Sep 17 00:00:00 2001
From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Wed, 16 Jan 2013 19:50:48 +0100
Subject: [PATCH 2/4] Remove DEFAULT_WORKBENCH_DIR.

We never used this.
Removed, as okayed by cwebber.
---
 mediagoblin/workbench.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mediagoblin/workbench.py b/mediagoblin/workbench.py
index 0d4db52b..0bd4096b 100644
--- a/mediagoblin/workbench.py
+++ b/mediagoblin/workbench.py
@@ -19,10 +19,6 @@ import shutil
 import tempfile
 
 
-DEFAULT_WORKBENCH_DIR = os.path.join(
-    tempfile.gettempdir(), u'mgoblin_workbench')
-
-
 # Actual workbench stuff
 # ----------------------
 

From 626a093ccc7bd275085cea1bbe7fb6ce14b47321 Mon Sep 17 00:00:00 2001
From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Thu, 17 Jan 2013 22:10:43 +0100
Subject: [PATCH 3/4] Move workbench into tools directory.

---
 mediagoblin/init/__init__.py         | 2 +-
 mediagoblin/tests/test_workbench.py  | 2 +-
 mediagoblin/{ => tools}/workbench.py | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename mediagoblin/{ => tools}/workbench.py (100%)

diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py
index ab6e6399..7c832442 100644
--- a/mediagoblin/init/__init__.py
+++ b/mediagoblin/init/__init__.py
@@ -26,7 +26,7 @@ from mediagoblin import mg_globals
 from mediagoblin.mg_globals import setup_globals
 from mediagoblin.db.open import setup_connection_and_db_from_config, \
     check_db_migrations_current, load_models
-from mediagoblin.workbench import WorkbenchManager
+from mediagoblin.tools.workbench import WorkbenchManager
 from mediagoblin.storage import storage_system_from_config
 
 
diff --git a/mediagoblin/tests/test_workbench.py b/mediagoblin/tests/test_workbench.py
index 9da8eea0..636c8689 100644
--- a/mediagoblin/tests/test_workbench.py
+++ b/mediagoblin/tests/test_workbench.py
@@ -18,7 +18,7 @@ import os
 import tempfile
 
 
-from mediagoblin import workbench
+from mediagoblin.tools import workbench
 from mediagoblin.mg_globals import setup_globals
 from mediagoblin.decorators import get_workbench
 from mediagoblin.tests.test_storage import get_tmp_filestorage
diff --git a/mediagoblin/workbench.py b/mediagoblin/tools/workbench.py
similarity index 100%
rename from mediagoblin/workbench.py
rename to mediagoblin/tools/workbench.py

From ba5ea989a5826440e8b84af8128dadd0ae252259 Mon Sep 17 00:00:00 2001
From: Sebastian Spaeth <Sebastian@SSpaeth.de>
Date: Thu, 17 Jan 2013 22:37:41 +0100
Subject: [PATCH 4/4] Return to media collection page if no collection selected

schendje rightly pointed out that we should not return to the media
homepage if we did not select a collection on the "collect" page, but
should actually return to the collect page.

This is an improvement of the user experience ;-)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
---
 mediagoblin/user_pages/views.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 30c78a38..d1ec23dc 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -226,6 +226,10 @@ def media_collect(request, media):
         messages.add_message(
             request, messages.ERROR,
             _('You have to select or add a collection'))
+        return redirect(request, "mediagoblin.user_pages.media_collect",
+                    user=media.get_uploader.username,
+                    media=media.id)
+
 
     # Check whether media already exists in collection
     elif CollectionItem.query.filter_by(