Merge branch 'bclermont-master'

This commit is contained in:
Ross Poulton 2011-02-27 23:45:49 +00:00
commit 7666ad668d

View File

@ -159,7 +159,7 @@ $(document).ready(function() {
<div id='tabload'> <div id='tabload'>
<h3>{% trans "Use Saved Query" %}</h3> <h3>{% trans "Use Saved Query" %}</h3>
<form method='get' action='{% url helpdesk_list %}'> <form method='get' action='{% url helpdesk_list %}'>
<p><label for='id_query_selector'>{% trans "Query" %}</label> <select name='saved_query' id='id_query_selector' /> <p><label for='id_query_selector'>{% trans "Query" %}</label> <select name='saved_query' id='id_query_selector'>
{% for q in user_saved_queries %} {% for q in user_saved_queries %}
<option value='{{ q.id }}'>{{ q.title }}{% if q.shared %} (Shared{% ifnotequal user q.user %} by {{ q.user.username }}{% endifnotequal %}){% endif %}</option> <option value='{{ q.id }}'>{{ q.title }}{% if q.shared %} (Shared{% ifnotequal user q.user %} by {{ q.user.username }}{% endifnotequal %}){% endif %}</option>
{% endfor %} {% endfor %}