-skip persona test is requests is not installed
- should use request.urlgen for location
This commit is contained in:
parent
e7b8059f17
commit
bd0b5daa44
@ -18,6 +18,8 @@ import pkg_resources
|
|||||||
import pytest
|
import pytest
|
||||||
import mock
|
import mock
|
||||||
|
|
||||||
|
pytest.importorskip("requests")
|
||||||
|
|
||||||
from mediagoblin import mg_globals
|
from mediagoblin import mg_globals
|
||||||
from mediagoblin.db.base import Session
|
from mediagoblin.db.base import Session
|
||||||
from mediagoblin.tests.tools import get_app
|
from mediagoblin.tests.tools import get_app
|
||||||
|
@ -305,8 +305,9 @@ def media_confirm_delete(request, media):
|
|||||||
if not location:
|
if not location:
|
||||||
location=media.url_to_prev(request.urlgen)
|
location=media.url_to_prev(request.urlgen)
|
||||||
if not location:
|
if not location:
|
||||||
location="mediagoblin.user_pages.user_home"
|
location=request.urlgen("mediagoblin.user_pages.user_home",
|
||||||
return redirect(request, location=location, user=username)
|
user=username)
|
||||||
|
return redirect(request, location=location)
|
||||||
else:
|
else:
|
||||||
messages.add_message(
|
messages.add_message(
|
||||||
request, messages.ERROR,
|
request, messages.ERROR,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user