diff options
| author | Michael Wood <michael.g.wood@intel.com> | 2015-02-03 15:40:41 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-10 23:07:49 +0000 |
| commit | 479338cc7b43b55740ba2396d94dd88c3d8fc445 (patch) | |
| tree | 2f8771620a1a66c646e29e91575abe0f8616ae80 /bitbake/lib/toaster/toastergui | |
| parent | 87074af8ceb712a0c31af05d3ec7a607cb186d6c (diff) | |
| download | poky-479338cc7b43b55740ba2396d94dd88c3d8fc445.tar.gz | |
bitbake: toaster: All machines add a column to link back to machine conf
Add a column with the "path" to the machine file and add a link back to
the vcs web to view the machine configuration file.
(Bitbake rev: c1462c0530fe6c34ffef87bcde7a363995b503c9)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui')
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/machines.html | 1 | ||||
| -rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/machines.html b/bitbake/lib/toaster/toastergui/templates/machines.html index c0d4c6cc33..e3329bf238 100644 --- a/bitbake/lib/toaster/toastergui/templates/machines.html +++ b/bitbake/lib/toaster/toastergui/templates/machines.html | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | <td class="layer"><a href="{%url "layerdetails" o.layer_version.id %}">{{o.layer_version.layer.name}}</a></td> | 48 | <td class="layer"><a href="{%url "layerdetails" o.layer_version.id %}">{{o.layer_version.layer.name}}</a></td> |
| 49 | <td class="source">{{o.layer_source.name}}</td> | 49 | <td class="source">{{o.layer_source.name}}</td> |
| 50 | <td class="branch">{{o.layer_version.commit}}</td> | 50 | <td class="branch">{{o.layer_version.commit}}</td> |
| 51 | <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> | ||
| 51 | <td class="select-or-add"> | 52 | <td class="select-or-add"> |
| 52 | <a href="#" class="btn btn-block select-machine-btn" data-machine-name="{{o.name}}" data-layer-version-id="{{o.layer_version.id}}" | 53 | <a href="#" class="btn btn-block select-machine-btn" data-machine-name="{{o.name}}" data-layer-version-id="{{o.layer_version.id}}" |
| 53 | {%if o.layer_version.id not in project_layers %}style="display:none" {%endif%} >Select machine</a> | 54 | {%if o.layer_version.id not in project_layers %}style="display:none" {%endif%} >Select machine</a> |
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 9d85a93b7b..c89b67bcd1 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
| @@ -2797,7 +2797,6 @@ if toastermain.settings.MANAGED: | |||
| 2797 | # retrieve the objects that will be displayed in the table; machines a paginator and gets a page range to display | 2797 | # retrieve the objects that will be displayed in the table; machines a paginator and gets a page range to display |
| 2798 | machine_info = _build_page_range(Paginator(queryset, request.GET.get('count', 10)),request.GET.get('page', 1)) | 2798 | machine_info = _build_page_range(Paginator(queryset, request.GET.get('count', 10)),request.GET.get('page', 1)) |
| 2799 | 2799 | ||
| 2800 | |||
| 2801 | context = { | 2800 | context = { |
| 2802 | 'objects' : machine_info, | 2801 | 'objects' : machine_info, |
| 2803 | 'project_layers' : project_layers, | 2802 | 'project_layers' : project_layers, |
| @@ -2834,6 +2833,10 @@ if toastermain.settings.MANAGED: | |||
| 2834 | 'qhelp' : "The Git branch, tag or commit. For the layers from the OpenEmbedded layer source, the revision is always the branch compatible with the Yocto Project version you selected for this project", | 2833 | 'qhelp' : "The Git branch, tag or commit. For the layers from the OpenEmbedded layer source, the revision is always the branch compatible with the Yocto Project version you selected for this project", |
| 2835 | 'hidden': 1, | 2834 | 'hidden': 1, |
| 2836 | }, | 2835 | }, |
| 2836 | { 'name' : 'Machine file', | ||
| 2837 | 'clclass' : 'machinefile', | ||
| 2838 | 'hidden' : 1, | ||
| 2839 | }, | ||
| 2837 | { 'name': 'Select', | 2840 | { 'name': 'Select', |
| 2838 | 'dclass': 'span2', | 2841 | 'dclass': 'span2', |
| 2839 | 'qhelp': "Add or delete machines to / from your project ", | 2842 | 'qhelp': "Add or delete machines to / from your project ", |
