Merge pull request #114 from unt-libraries/universal-search-default

Universal search default

LICENSE

@@ -1,4 +1,4 @@
-Copyright © 2014, Regents of the University of North Texas
+Copyright © 2017, Regents of the University of North Texas
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -23,6 +23,7 @@ Contributors:
 - [Damon Kelley](https://github.com/damonkelley)
 - [Lauren Ko](https://github.com/ldko)
 - [Mark Phillips](https://github.com/vphill)
+- [Gio Gottardi](https://github.com/somexpert)
 
 
 ## Developing

docs/conf.py

@@ -48,7 +48,7 @@
 
 # General information about the project.
 project = u'Django Name'
-copyright = u'2015, University of North Texas Libraries'
+copyright = u'2017, University of North Texas Libraries'
 author = u'University of North Texas Libraries'
 
 # The version info for the project you're documenting, acts as replacement for

docs/index.rst

@@ -30,9 +30,11 @@ Acknowledgements
 - `Damon Kelley`_
 - `Lauren Ko`_
 - `Mark Phillips`_
+- `Gio Gottardi`_
 
 .. _`Joey Liechty`: http://github.com/yeahdef
 .. _`Damon Kelley`: http://github.com/damonkelley
 .. _`Lauren Ko`: http://github.com/ldko
 .. _`Mark Phillips`: http://github.com/vphill
+.. _`Gio Gottardi`: http://github.com/somexpert
 

name/__init__.py

@@ -1,2 +1,2 @@
 __title__ = 'Django Name'
-__version__ = '1.1.0'
+__version__ = '1.1.1'

name/templates/name/_navbar.html

@@ -30,12 +30,13 @@
                     <select class="form-control" name="q_type" id="q_type">
                         {# Show current searched type as the default selection, if it exists #}
                         {% for k, v in name_types.items %}
-                            {% if q_type == v %}
+                            {% if request.GET.q_type == v %}
                                 <option value="{{ v }}" selected>{{ v }}</option>
                             {% else %}
                                 <option value="{{ v }}">{{ v }}</option>
                             {% endif %}
                         {% endfor %}
+                        <option value="Any Type" {% if not request.GET.q_type or request.GET.q_type == "Any Type" %}selected{% endif %}>Any Type</option>
                     </select>
                     <input class="form-control" type="text" name="q" id="names" value="{{ q }}">
                     <input type="hidden" value="{% url "name:search-json" %}" id="autocomplete">

name/templates/name/search.html

@@ -17,6 +17,7 @@ <h3>Search {{ name_app_title }}</h3>
                                     <option value="{{ v }}">{{ v }}</option>
                                 {% endif %}
                             {% endfor %}
+                            <option value="Any Type" {% if not request.GET.q_type or request.GET.q_type == "Any Type" %}selected{% endif %}>Any Type</option>
                         </select>
                         <input class="form-control" type="text" name="q" id="large_names" value="{{ request.GET.q }}">
                         <button class="btn btn-default" type="submit">Submit</button>

name/utils.py

@@ -62,9 +62,12 @@ def resolve_type(q_type):
 
     q_type = q_type.split(',')
 
-    # Iterate through the Name Types and create a list of Name IDs
-    # using the corresponding strings values in q_type
-    return [k for k, v in Name.NAME_TYPE_CHOICES if v in q_type]
+    if "Any Type" in q_type:
+        return [k for k, v in Name.NAME_TYPE_CHOICES]
+    else:
+        # Iterate through the Name Types and create a list of Name IDs
+        # using the corresponding strings values in q_type
+        return [k for k, v in Name.NAME_TYPE_CHOICES if v in q_type]
 
 
 # TODO: Look at reducing the number of queries.