user-bookmarks: add ${server_url} template to be used in the links.
This commit is contained in:
parent
50b4956860
commit
2bede91515
2 changed files with 10 additions and 4 deletions
|
|
@ -496,6 +496,7 @@ class MyAccountView(BaseAppView, DataGridAppView):
|
|||
if not user_bookmark:
|
||||
raise HTTPFound(redirect_url)
|
||||
|
||||
# repository set
|
||||
if user_bookmark.repository:
|
||||
repo_name = user_bookmark.repository.repo_name
|
||||
base_redirect_url = h.route_path(
|
||||
|
|
@ -506,7 +507,7 @@ class MyAccountView(BaseAppView, DataGridAppView):
|
|||
.safe_substitute({'repo_url': base_redirect_url})
|
||||
else:
|
||||
redirect_url = base_redirect_url
|
||||
|
||||
# repository group set
|
||||
elif user_bookmark.repository_group:
|
||||
repo_group_name = user_bookmark.repository_group.group_name
|
||||
base_redirect_url = h.route_path(
|
||||
|
|
@ -517,9 +518,11 @@ class MyAccountView(BaseAppView, DataGridAppView):
|
|||
.safe_substitute({'repo_group_url': base_redirect_url})
|
||||
else:
|
||||
redirect_url = base_redirect_url
|
||||
|
||||
# custom URL set
|
||||
elif user_bookmark.redirect_url:
|
||||
redirect_url = user_bookmark.redirect_url
|
||||
server_url = h.route_url('home').rstrip('/')
|
||||
redirect_url = string.Template(user_bookmark.redirect_url) \
|
||||
.safe_substitute({'server_url': server_url})
|
||||
|
||||
log.debug('Redirecting bookmark %s to %s', user_bookmark, redirect_url)
|
||||
raise HTTPFound(redirect_url)
|
||||
|
|
|
|||
|
|
@ -23,8 +23,11 @@
|
|||
<label class="btn-link btn-danger">${_('Clear')}:</label>
|
||||
${h.checkbox('remove', value=True)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<p class="help-block help-block-inline" >
|
||||
${_('Server URL is available as ${server_url} variable. E.g. Redirect url: ${server_url}/_admin/exception_tracker')}
|
||||
</p>
|
||||
|
||||
<div class="label">
|
||||
<label for="redirect_url">${_('Redirect URL')}:</label>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue