Commit d9d01b35 authored by Chris Haines's avatar Chris Haines

Setting admin endpoint url='/' allows non index_view views to generate url

from endpoint.
parent 7600278b
...@@ -177,7 +177,10 @@ class BaseView(object): ...@@ -177,7 +177,10 @@ class BaseView(object):
if self.admin.url != '/': if self.admin.url != '/':
self.url = '%s/%s' % (self.admin.url, self.endpoint) self.url = '%s/%s' % (self.admin.url, self.endpoint)
else: else:
self.url = '/' if self == admin.index_view:
self.url = '/'
else:
self.url = '/%s' % self.endpoint
else: else:
if not self.url.startswith('/'): if not self.url.startswith('/'):
self.url = '%s/%s' % (self.admin.url, self.url) self.url = '%s/%s' % (self.admin.url, self.url)
......
...@@ -150,6 +150,10 @@ def test_baseview_registration(): ...@@ -150,6 +150,10 @@ def test_baseview_registration():
view = MockView(url='/test/test') view = MockView(url='/test/test')
view.create_blueprint(base.Admin()) view.create_blueprint(base.Admin())
eq_(view.url, '/test/test') eq_(view.url, '/test/test')
view = MockView(endpoint='test')
view.create_blueprint(base.Admin(url='/'))
eq_(view.url, '/test')
def test_baseview_urls(): def test_baseview_urls():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment