bitbake: toaster: All machines Add filtering based on layer in project

Add a filter so that we can filter machines which are already being provided
by a layer in the current project.
Also make sure that we're only showing layers which are compatible with
the current project.
Also handle no results returned and page heading reflecting the number of
results returned from a search.

AlexD solved conflicts while merging the patch.

(Bitbake rev: b0ae4d2bb71e897d8a846a3cf14b7151baa09bd2)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 86 insertions, 29 deletions

diff --git a/bitbake/lib/toaster/toastergui/templates/machines.html b/bitbake/lib/toaster/toastergui/templates/machines.html
index 650c47b..9930a94 100644
--- a/bitbake/lib/toaster/toastergui/templates/machines.html
+++ b/bitbake/lib/toaster/toastergui/templates/machines.html
@@ -30,38 +30,57 @@
 {% include "layers_dep_modal.html" %}
 <div class="page-header">
   <h1>
+    {% if request.GET.search %}
+      {% if objects.paginator.count != 0 %}
+        {{objects.paginator.count}} machines found
+       {% else %}
+        No Machines found
+       {% endif %}
+    {% else %}
+
     All machines
     <i class="icon-question-sign get-help heading-help" title="This page lists all the machines compatible with the current project that Toaster knows about. They include community-created targets suitable for use on top of OpenEmbedded Core and any targets you have imported"></i>
+    {% endif %}
   </h1>
 </div>
-
 <div class="alert alert-info lead" id="alert-area" style="display:none">
   <button type="button" class="close" id="dismiss-alert">&times;</button>
   <span id="alert-msg"></span>
 </div>
+{% if request.GET.search and objects.paginator.count == 0 %}
+<div class="alert row-fluid">
+<form class="navbar-search input-append pull-left" id="searchform">
+  <input class="input-xxlarge" id="search" name="search" type="text" placeholder="Search machines" value="{{request.GET.search}}"><a href="javascript:$('#search').val('');searchform.submit()" class="add-on btn" tabindex="-1"><i class="icon-remove"></i></a>
+    <input type="hidden" name="orderby" value="">
+      <input type="hidden" name="page" value="1">
+        <button class="btn" type="submit" value="Search">Search</button>
+        <button type="submit" class="btn btn-link"><a href="{%url 'machines' %}">Show all machines</a></button>
+      </form>
+    </div>
+{% else %}
+  {% include "basetable_top.html" %}
+  {% for o in objects %}
+  <tr class="data">
+    <td class="machine">{{o.name}}</td>
+    <td class="description">{{o.description}}</td>
+    <td class="layer"><a href="{%url "layerdetails" o.layer_version.id %}">{{o.layer_version.layer.name}}</a></td>
+    <td class="source">{{o.layer_source.name}}</td>
+    <td class="branch">{{o.layer_version.get_vcs_reference}}</td>
+    <td class="machinefile"><code>/machine/conf/{{o.name}}.conf</code><a href="{{o.get_vcs_machine_file_link_url}}" target="_blank"><i class="icon-share get-info"></i></a></td>
+    <td class="select-or-add">
+      <a href="#" class="btn btn-block select-machine-btn" data-machine-name="{{o.name}}" data-layer-version-id="{{o.layer_version.id}}"
+          {%if o.layer_version.id not in project_layers %}style="display:none" {%endif%}  >Select machine</a>
+      <a  href="#" class="btn btn-block nopop add-layer" data-layer-version-id="{{o.layer_version.id}}" data-layer-name="{{o.layer_version.layer.name}}" {%if o.layer_version.id in project_layers %}style="display:none" {%endif%}
+          >
+        <i class="icon-plus"></i>
+        Add layer
+        <i class="icon-question-sign get-help" title="To build this machine, you must first add the {{o.layer_version.layer.name}} layer to your project"></i>
+      </a>
+    </td>
+  </tr>
+  {% endfor %}
 
-{% include "basetable_top.html" %}
-{% for o in objects %}
-<tr class="data">
-  <td class="machine">{{o.name}}</td>
-  <td class="description">{{o.description}}</td>
-  <td class="layer"><a href="{%url "layerdetails" o.layer_version.id %}">{{o.layer_version.layer.name}}</a></td>
-  <td class="source">{{o.layer_source.name}}</td>
-  <td class="branch">{{o.layer_version.commit}}</td>
-  <td class="machinefile"><code>/machine/conf/{{o.name}}.conf</code><a href="{{o.get_vcs_machine_file_link_url}}" target="_blank"><i class="icon-share get-info"></i></a></td>
-  <td class="select-or-add">
-    <a href="#" class="btn btn-block select-machine-btn" data-machine-name="{{o.name}}" data-layer-version-id="{{o.layer_version.id}}"
-        {%if o.layer_version.id not in project_layers %}style="display:none" {%endif%}  >Select machine</a>
-    <a  href="#" class="btn btn-block nopop add-layer" data-layer-version-id="{{o.layer_version.id}}" data-layer-name="{{o.layer_version.layer.name}}" {%if o.layer_version.id in project_layers %}style="display:none" {%endif%}
-        >
-      <i class="icon-plus"></i>
-      Add layer
-      <i class="icon-question-sign get-help" title="To build this machine, you must first add the {{o.layer_version.layer.name}} layer to your project"></i>
-    </a>
-  </td>
-</tr>
-{% endfor %}
-
-{% include "basetable_bottom.html" %}
+  {% include "basetable_bottom.html" %}
+{% endif %}
 
 {% endblock %}
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 2e52d2b..7dc4bbd 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -2789,11 +2789,38 @@ if toastermain.settings.MANAGED:
 
         queryset_all = Machine.objects.all()
 
-        queryset_with_search = _get_queryset(Machine, queryset_all, None, search_term, ordering_string, '-name')
-        queryset = _get_queryset(Machine, queryset_all, filter_string, search_term, ordering_string, '-name')
+        prj = Project.objects.get(pk = request.session['project_id'])
+        compatible_layers = prj.compatible_layerversions()
+        # Make sure we only show machines / layers which are compatible with the current project
+        queryset_all = queryset_all.filter(layer_version__in=compatible_layers)
 
         project_layers = ProjectLayer.objects.filter(project_id=request.session['project_id']).values_list('layercommit',flat=True)
 
+        by_pass_filter_string = False
+        #  "special" filters identified by these valid filter strings we
+        # by pass the usual filter applying method because we're filtering using
+        # a subquery done by project_layers
+        if "name:inprj" in filter_string:
+          queryset_all = queryset_all.filter(layer_version__in=project_layers)
+          by_pass_filter_string = True
+
+        if "name:notinprj" in filter_string:
+          queryset_all = queryset_all.exclude(layer_version__in=project_layers)
+          by_pass_filter_string = True
+
+        queryset_with_search = _get_queryset(Machine, queryset_all, None, search_term, ordering_string, '-name')
+
+        if by_pass_filter_string:
+          queryset = _get_queryset(Machine, queryset_all, None, search_term, ordering_string, '-name')
+        else:
+          queryset = _get_queryset(Machine, queryset_all, filter_string, search_term, ordering_string, '-name')
+
+        selected_filter_count = {
+          'inprj' : queryset.filter(layer_version__in=project_layers).count(),
+          'notinprj' : queryset.exclude(layer_version__in=project_layers).count()
+        }
+
+
         # retrieve the objects that will be displayed in the table; machines a paginator and gets a page range to display
         machine_info = _build_page_range(Paginator(queryset, request.GET.get('count', 10)),request.GET.get('page', 1))
 
@@ -2802,7 +2829,7 @@ if toastermain.settings.MANAGED:
             'project_layers' : project_layers,
             'objectname' : "machines",
             'default_orderby' : 'name:+',
-            'total_count': queryset_with_search.count(),
+            'total_count': machine_info.paginator.count,
 
             'tablecols' : [
                 {   'name': 'Machine',
@@ -2840,12 +2867,23 @@ if toastermain.settings.MANAGED:
                     'hidden' : 1,
                 },
                 {   'name': 'Select',
-                    'dclass': 'span2',
-                    'qhelp': "Add or delete machines to / from your project ",
+                    'dclass': 'select span2',
+                    'qhelp': "Sets the selected machine as the project machine. You can only have one machine per project",
+                    'filter': {
+                        'class': 'select',
+                        'label': 'Show:',
+                        'options': [
+                          (u'Machines provided by layers added to this project', 'name:inprj', selected_filter_count['inprj']),
+                          (u'Machines provided by layers not added to this project', 'name:notinprj', selected_filter_count['notinprj']),
+
+                        ],
+                    }
+
                 },
 
             ]
         }
+
         response = render(request, template, context)
         _save_parameters_cookies(response, pagesize, orderby, request)