検索フォームの未入力をバリデーションするようにした

kawazrepos · Jul 27, 2014 · 3ad6f75 · 3ad6f75
1 parent 8c54d63
commit 3ad6f75
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/src/kawaz/core/search/backends.py b/src/kawaz/core/search/backends.py
@@ -54,8 +54,7 @@ def build_schema(self, fields):
             field_mapping = mapping[field_class.index_fieldname]
 
             if field_mapping['type'] == 'string' and field_class.indexed:
-                if not hasattr(field_class, 'facet_for') and not \
-                                  field_class.field_type in('ngram', 'edge_ngram'):
+                if not hasattr(field_class, 'facet_for') and not field_class.field_type in('ngram', 'edge_ngram'):
                     field_mapping['analyzer'] = self.DEFAULT_ANALYZER
             mapping.update({field_class.index_fieldname: field_mapping})
         return (content_field_name, mapping)

diff --git a/src/kawaz/templates/search/search.html b/src/kawaz/templates/search/search.html
@@ -6,29 +6,31 @@
         <form type="get" action="." role="form">
             <div class="form-group">
                 <label for="q" class="sr-only">検索ワード</label>
-                <input type="text" class="form-control" name="q">
+                <input type="text" class="form-control" name="q" value="{{ query }}" required>
             </div>
             <div class="form-group">
                 <button type="submit" class="btn btn-primary btn-large">Search</button>
             </div>
         </form>
     </div>
-    <div class="search-results">
-        <h1>「{{ query }}」の検索結果</h1>
-        <div>
-        {% if not page.object_list|length_is:0 %}
-            <div class="alert alert-info" role="alert"><strong>{{ page.object_list|length }}</strong>件の検索結果が見つかりました</div>
-            {% for result in page.object_list %}
-                <article class="search-result">
-                    <h1><a href="{{ result.object.get_absolute_url }}">{{ result.title }}</a></h1>
-                    <p>
-                        {% highlight result.body with query html_tag "mark" %}
-                    </p>
-                </article>
-            {% endfor %}
-        {% else %}
-            <div class="alert alert-info" role="alert">検索結果は見つかりませんでした</div>
-        {% endif %}
+    {% if query %}
+        <div class="search-results">
+            <h1>「{{ query }}」の検索結果</h1>
+            <div>
+                {% if not page.object_list|length_is:0 %}
+                    <div class="alert alert-info" role="alert"><strong>{{ page.object_list|length }}</strong>件の検索結果が見つかりました</div>
+                    {% for result in page.object_list %}
+                        <article class="search-result">
+                            <h1><a href="{{ result.object.get_absolute_url }}">{{ result.title }}</a></h1>
+                            <p>
+                                {% highlight result.body with query html_tag "mark" %}
+                            </p>
+                        </article>
+                    {% endfor %}
+                {% else %}
+                    <div class="alert alert-info" role="alert">検索結果は見つかりませんでした</div>
+                {% endif %}
+            </div>
         </div>
-    </div>
+    {% endif %}
 {% endblock %}