diff options
Diffstat (limited to 'lib/toaster/toastergui/templates/filtersnippet.html')
| -rw-r--r-- | lib/toaster/toastergui/templates/filtersnippet.html | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/lib/toaster/toastergui/templates/filtersnippet.html b/lib/toaster/toastergui/templates/filtersnippet.html index fe70e7143..f624d88ba 100644 --- a/lib/toaster/toastergui/templates/filtersnippet.html +++ b/lib/toaster/toastergui/templates/filtersnippet.html @@ -1,5 +1,6 @@ {% load projecttags %} <!-- '{{f.class}}' filter --> +{% with f.class as key %} <form id="filter_{{f.class}}" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true"> <input type="hidden" name="search" value="{{request.GET.search}}"/> <div class="modal-header"> @@ -13,22 +14,37 @@ <div class="modal-body"> <p>{{f.label}}</p> <label class="radio"> - <input type="radio" name="filter" {%if request.GET.filter%}{{f.options|check_filter_status:request.GET.filter}} {%else%} checked {%endif%} value=""> All {%if filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%} ({{total_count}}) + <input type="radio" name="filter" {%if request.GET.filter%}{{f.options|check_filter_status:request.GET.filter}} {%else%} checked {%endif%} value="" data-key="{{key}}"> All {%if filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%} </label> {% for option in f.options %} - {% if option.2 %} - <label class="radio"> - <input type="radio" name="filter" {%if request.GET.filter == option.1 %}checked{%endif%} value="{{option.1}}"> {{option.0}} (<span id="{{option.1}}_count">{{option.2}}</span>) + {% if option.1 == 'daterange' %} + <div class="form-inline"> + <label class="radio"> + <input type="radio" name="filter" id="filter_value_{{key}}" {%if key == daterange_selected %}checked{%endif%} value="{{option.1}}" data-key="{{key}}"> {{option.0}} {% else %} - <label class="radio muted"> - <input type="radio" name="filter" disabled {%if request.GET.filter == option.1 %}checked{%endif%} value="{{option.1}}"> {{option.0}} (<span id="{{option.1}}_count">{{option.2}}</span>) + {% if 1 %} + <label class="radio"> + <input type="radio" name="filter" {%if request.GET.filter == option.1 %}checked{%endif%} value="{{option.1}}" data-key="{{key}}"> {{option.0}} + {% comment "do not disable radio selections by count for now" %}{% else %} + <label class="radio muted"> + <input type="radio" name="filter" disabled {%if request.GET.filter == option.1 %}checked{%endif%} value="{{option.1}}" data-key="{{key}}"> {{option.0}} + {% endcomment %}{% endif %} {% endif %} {% if option.3 %}<i class="icon-question-sign get-help" data-placement="right" title="{{option.3}}"></i>{% endif %} - </label> + </label> + {% if option.1 == 'daterange' %} + <input type="text" id="date_from_{{key}}" name="date_from_{{key}}" disabled class="input-small" /><label class="help-inline">to</label> + <input type="text" id="date_to_{{key}}" name="date_to_{{key}}" disabled class="input-small" /> + <label class="help-inline get-help" >(dd/mm/yyyy)</label> + </div> + {% endif %} {% endfor %} + <!-- daterange persistence --> + <input type="hidden" id="last_date_from_{{key}}" name="last_date_from" value="{{last_date_from}}"/> + <input type="hidden" id="last_date_to_{{key}}" name="last_date_to" value="{{last_date_to}}"/> </div> <div class="modal-footer"> - <button type="submit" class="btn btn-primary">Apply</button> + <button type="submit" class="btn btn-primary" data-key="{{key}}">Apply</button> {% if request.GET.filter %} {% if request.GET.filter|string_remove_regex:':.*' != f.options.0.1|string_remove_regex:':.*' %} <span class="help-inline pull-left">You can only apply one filter to the table. This filter will override the current filter.</span> @@ -36,4 +52,4 @@ {% endif %} </div> </form> - +{% endwith %} |