Merge pull request #6650 from fecgov/feature/6649-aos-murs

6649 AOs & MURs Fixes
fecgov · Jan 24, 2025 · ea2faeb · ea2faeb
2 parents 479b7b6 + 3eb3527
commit ea2faeb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/fec/legal/templates/legal-search-results-advisory_opinions.jinja b/fec/legal/templates/legal-search-results-advisory_opinions.jinja
@@ -15,6 +15,7 @@
 {% endblock %}
 
 {% block filters %}
+<input id="doc_type" type="hidden" name="doc_type" value="advisory_opinions">
 <div class="filters__inner">
   {{ text.field('ao_no', 'AO number') }}
   {{ text.field('ao_requestor', 'Requestor name (or AO name)', select_qty='single') }}
@@ -49,9 +50,9 @@
   <button type="button" class="js-accordion-trigger accordion__button">Citations</button>
   <div class="accordion__content">
     <label>If more than one citation is entered:</label>
-    <input type="radio" id="ao_citation_require_all_false" name="ao_citation_require_all" value="false"{% if not ao_citation_require_all %} checked{% endif %}>
+    <input type="radio" id="ao_citation_require_all_false" name="ao_citation_require_all" value="false"{% if ao_citation_require_all != 'true' %} checked{% endif %}>
     <label for="ao_citation_require_all_false">Show cases citing any of them</label>
-    <input type="radio" id="ao_citation_require_all_true" name="ao_citation_require_all" value="true"{% if ao_citation_require_all %} checked{% endif %}>
+    <input type="radio" id="ao_citation_require_all_true" name="ao_citation_require_all" value="true"{% if ao_citation_require_all == 'true' %} checked{% endif %}>
     <label for="ao_citation_require_all_true">Show cases citing all of them</label>
     {{ typeahead.field('ao_regulatory_citation', 'Regulatory citation', False, dataset='aoRegulatoryCitations', allow_text=False) }}
     {{ typeahead.field('ao_statutory_citation', 'Statutory citation', False, dataset='aoStatutoryCitations', allow_text=False) }}

diff --git a/fec/legal/templates/legal-search-results-murs.jinja b/fec/legal/templates/legal-search-results-murs.jinja
@@ -143,9 +143,9 @@
 
     <div class="accordion__content">
       <label>If more than one citation is entered:</label>
-      <input type="radio" id="case_citation_require_all_false" name="case_citation_require_all" value="false"{% if not case_citation_require_all %} checked{% endif %}>
+      <input type="radio" id="case_citation_require_all_false" name="case_citation_require_all" value="false"{% if case_citation_require_all != 'true' %} checked{% endif %}>
       <label for="case_citation_require_all_false">Show cases citing any of them</label>
-      <input type="radio" id="case_citation_require_all_true" name="case_citation_require_all" value="true"{% if case_citation_require_all %} checked{% endif %}>
+      <input type="radio" id="case_citation_require_all_true" name="case_citation_require_all" value="true"{% if case_citation_require_all == 'true' %} checked{% endif %}>
       <label for="case_citation_require_all_true">Show cases citing all of them</label>
       {{ typeahead.field('case_regulatory_citation', 'Regulatory citation', False, dataset='caseRegulatoryCitations', allow_text=False) }}
       {{ typeahead.field('case_statutory_citation', 'Statutory citation', False, dataset='caseStatutoryCitations', allow_text=False) }}
@@ -246,9 +246,13 @@
         {% endif %}
         </li>
       {% endif %}
-      {% if case_citation_require_all %}
+      {% if case_regulatory_citation or case_statutory_citation %}
         <li data-tag-category="case_regulatory_citation" class="tag__category">
-          <div data-removable="true" class="tag__item">Cases with all citations<button class="button js-close tag__remove" data-tag="case_citation_require_all"><span class="u-visually-hidden">Remove</span></button></div>
+          {% if case_citation_require_all =='true' %}
+          <div data-removable="false" class="tag__item">Cases with all citations</div>
+          {% else %}
+          <div data-removable="false" class="tag__item">Cases with any citations</div>
+          {% endif %}
         </li>
       {% endif %}
       {% if case_regulatory_citation %}