aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-01-17 15:51:30 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-01-17 15:51:30 -0600
commit00cf28da215e73c494f553e7de3d21a9b63cf0cf (patch)
tree461ee702dca35ea6ffe56380286c24abe3bd155f
parentc813f0bd5776dde0e3c42c12b17f83f211b50e6a (diff)
parentba5ea989a5826440e8b84af8128dadd0ae252259 (diff)
downloadmediagoblin-00cf28da215e73c494f553e7de3d21a9b63cf0cf.tar.lz
mediagoblin-00cf28da215e73c494f553e7de3d21a9b63cf0cf.tar.xz
mediagoblin-00cf28da215e73c494f553e7de3d21a9b63cf0cf.zip
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
-rw-r--r--mediagoblin/init/__init__.py2
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/user.html6
-rw-r--r--mediagoblin/tests/test_workbench.py2
-rw-r--r--mediagoblin/tools/workbench.py (renamed from mediagoblin/workbench.py)4
-rw-r--r--mediagoblin/user_pages/views.py4
5 files changed, 12 insertions, 6 deletions
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/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() %}
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
index 0d4db52b..0bd4096b 100644
--- a/mediagoblin/workbench.py
+++ b/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
# ----------------------
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(