Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: showing priorities in advanced search in hardcode (RhBug:1139932) #45

Merged
merged 1 commit into from Nov 24, 2017
Merged

fix: showing priorities in advanced search in hardcode (RhBug:1139932) #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions tcms/search/views.py
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@

from tcms.core.helpers.cache import cached_entities
from tcms.core.utils.raw_sql import RawSQL
from tcms.management.models import Priority
from tcms.search.forms import CaseForm, RunForm, PlanForm
from tcms.search.order import order_targets
from tcms.search.query import SmartDjangoQuery
Expand Down Expand Up @@ -44,6 +45,7 @@ def advance_search(request, tmpl='search/advanced_search.html'):
(p.pk, p.name) for p in cached_entities('product')
]
PLAN_TYPE_CHOICES = cached_entities('testplantype')
priorities = Priority.objects.filter(is_active=True).order_by('value')
errors = fmt_errors(errors)
return render(request, tmpl, context=locals())

Expand Down
8 changes: 3 additions & 5 deletions tcms/templates/search/advanced_search.html
View file
Open in desktop
Expand Up @@ -239,11 +239,9 @@ <h3>Case</h3>
<div class="title"><label>Priority&nbsp;:</label></div>
<div class="listinfo_input">
<ul>
<li><input type="checkbox" name="cs_priority" value="1" /><span>P1</span></li>
<li><input type="checkbox" name="cs_priority" value="2" /><span>P2</span></li>
<li><input type="checkbox" name="cs_priority" value="3" /><span>P3</span></li>
<li><input type="checkbox" name="cs_priority" value="4" /><span>P4</span></li>
<li><input type="checkbox" name="cs_priority" value="5" /><span>P5</span></li>
{% for priority in priorities.iterator %}
<li><input type="checkbox" name="cs_priority" value="{{ priority.pk }}" /><span>{{ priority.value }}</span></li>
{% endfor %}
</ul>
</div>
</div>
Expand Down