* [layerindex-web][patch v1 1/1] recipes.html: Require keyword for recipe search
2017-11-06 19:01 [layerindex-web][patch v1 0/1] recipes.html: Require keyword for recipe search Amanda Brindle
@ 2017-11-06 19:01 ` Amanda Brindle
0 siblings, 0 replies; 2+ messages in thread
From: Amanda Brindle @ 2017-11-06 19:01 UTC (permalink / raw)
To: yocto; +Cc: paul.eggleton, Amanda Brindle
Use JavaScript to check if the search box for recipe search is
empty before querying the database. This will prevent the "502
Bad Gateway" error that occurs when the query takes too long due
to the large list of recipes.
Add a browse button for the Machines and Distros pages.
Fixes [YOCTO #11930]
Signed-off-by: Amanda Brindle <amanda.r.brindle@intel.com>
---
layerindex/views.py | 10 ++++++++--
templates/layerindex/distros.html | 3 ++-
templates/layerindex/machines.html | 3 ++-
templates/layerindex/recipes.html | 17 ++++++++++++++++-
4 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/layerindex/views.py b/layerindex/views.py
index 3b22067..9b5d505 100644
--- a/layerindex/views.py
+++ b/layerindex/views.py
@@ -656,7 +656,10 @@ class MachineSearchView(ListView):
def get_queryset(self):
_check_url_branch(self.kwargs)
- query_string = self.request.GET.get('q', '')
+ if self.request.GET.get('search', ''):
+ query_string = self.request.GET.get('q', '')
+ else:
+ query_string = ""
init_qs = Machine.objects.filter(layerbranch__branch__name=self.kwargs['branch'])
if query_string.strip():
entry_query = simplesearch.get_query(query_string, ['name', 'description'])
@@ -705,7 +708,10 @@ class DistroSearchView(ListView):
def get_queryset(self):
_check_url_branch(self.kwargs)
- query_string = self.request.GET.get('q', '')
+ if self.request.GET.get('search', ''):
+ query_string = self.request.GET.get('q', '')
+ else:
+ query_string = ""
init_qs = Distro.objects.filter(layerbranch__branch__name=self.kwargs['branch'])
if query_string.strip():
entry_query = simplesearch.get_query(query_string, ['name', 'description'])
diff --git a/templates/layerindex/distros.html b/templates/layerindex/distros.html
index 7085584..34b5419 100644
--- a/templates/layerindex/distros.html
+++ b/templates/layerindex/distros.html
@@ -34,7 +34,8 @@
<div class="input-append">
<form id="filter-form" action="{% url 'distro_search' url_branch %}" method="get">
<input type="text" class="input-xxlarge" id="appendedInputButtons" placeholder="Search distros" name="q" value="{{ search_keyword }}" />
- <button class="btn" type="submit">search</button>
+ <button class="btn" type="submit" name="search" value="1">search</button>
+ <button class="btn" type="submit" name="browse" value="1">browse</button>
</form>
</div>
</div>
diff --git a/templates/layerindex/machines.html b/templates/layerindex/machines.html
index 2a9f947..d91228a 100644
--- a/templates/layerindex/machines.html
+++ b/templates/layerindex/machines.html
@@ -33,7 +33,8 @@
<div class="input-append">
<form id="filter-form" action="{% url 'machine_search' url_branch %}" method="get">
<input type="text" class="input-xxlarge" id="appendedInputButtons" placeholder="Search machines" name="q" value="{{ search_keyword }}" />
- <button class="btn" type="submit">search</button>
+ <button class="btn" type="submit" name="search" value="1">search</button>
+ <button class="btn" type="submit" name="browse" value="1">browse</button>
</form>
</div>
</div>
diff --git a/templates/layerindex/recipes.html b/templates/layerindex/recipes.html
index 60a2667..ae69be6 100644
--- a/templates/layerindex/recipes.html
+++ b/templates/layerindex/recipes.html
@@ -32,13 +32,14 @@
<div class="row-fluid">
<div class="input-append">
- <form id="filter-form" action="{% url 'recipe_search' url_branch %}" method="get">
+ <form id="filter-form" action="{% url 'recipe_search' url_branch %}" method="get" onsubmit="return validate()">
<input type="text" class="input-xxlarge" id="appendedInputButtons" placeholder="Search recipes" name="q" value="{{ search_keyword }}" />
<button class="btn" type="submit">search</button>
</form>
</div>
</div>
+ <div id="error"> </div>
{% if recipe_list %}
<table class="table table-striped table-bordered recipestable">
<thead>
@@ -87,5 +88,19 @@
$('.icon-hdd').tooltip({title:"Inherits image"});
$('.label-inverse').tooltip();
});
+
+ function validate(){
+ var x = document.getElementById("appendedInputButtons").value;
+ var error = document.getElementById("error");
+ error.style.display = "none";
+ if (x == ""){
+ error.innerHTML = "<error>Recipe search cannot be blank</error>";
+ $("error").addClass("control-group alert alert-error");
+ error.style.display = "block";
+ return false;
+ }
+ }
+
+
</script>
{% endblock %}
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread