Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

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
 
 

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() %}

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

mediagoblin/tools/workbench.py

@@ -19,10 +19,6 @@ import shutil
 import tempfile
 
 
-DEFAULT_WORKBENCH_DIR = os.path.join(
-    tempfile.gettempdir(), u'mgoblin_workbench')
-
-
 # Actual workbench stuff
 # ----------------------
 

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(