summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/toaster')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/layers.html9
-rw-r--r--bitbake/lib/toaster/toastergui/templates/newproject.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/project.html4
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py4
4 files changed, 14 insertions, 7 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/layers.html b/bitbake/lib/toaster/toastergui/templates/layers.html
index 4e923326c8..ced54c2098 100644
--- a/bitbake/lib/toaster/toastergui/templates/layers.html
+++ b/bitbake/lib/toaster/toastergui/templates/layers.html
@@ -52,7 +52,14 @@
52 <a target="_blank" href="{{ o.get_vcs_dirpath_link_url }}"><i class="icon-share get-info"></i></a> 52 <a target="_blank" href="{{ o.get_vcs_dirpath_link_url }}"><i class="icon-share get-info"></i></a>
53 {% endif %} 53 {% endif %}
54 </td> 54 </td>
55 <td class="branch">{% if o.branch %}{{o.branch}}{% else %}{{o.up_branch.name}}{% endif %}</td> 55 <td class="branch">
56 {% if o.branch %}
57 {{o.branch}}
58 {% else %}
59 {{o.up_branch.name}}
60 <i class="icon-question-sign get-help hover-help" title="Your builds will use the tip of the branch you have cloned or downloaded to your computer, so nothing will be fetched"></i>
61 {% endif %}
62 </td>
56 <td class="dependencies"> 63 <td class="dependencies">
57 {% with ods=o.dependencies.all%} 64 {% with ods=o.dependencies.all%}
58 {% if ods.count %} 65 {% if ods.count %}
diff --git a/bitbake/lib/toaster/toastergui/templates/newproject.html b/bitbake/lib/toaster/toastergui/templates/newproject.html
index 5a5e1e6dfe..512a8fa68f 100644
--- a/bitbake/lib/toaster/toastergui/templates/newproject.html
+++ b/bitbake/lib/toaster/toastergui/templates/newproject.html
@@ -18,12 +18,12 @@
18 <input type="text" class="input-xlarge" required id="new-project-name" name="projectname"> 18 <input type="text" class="input-xlarge" required id="new-project-name" name="projectname">
19 {% if releases.count > 1 %} 19 {% if releases.count > 1 %}
20 <label class="project-form"> 20 <label class="project-form">
21 Release version 21 Release
22 <i class="icon-question-sign get-help" title="The version of the build system you want to use"></i> 22 <i class="icon-question-sign get-help" title="The version of the build system you want to use"></i>
23 </label> 23 </label>
24 <select name="projectversion" id="projectversion"> 24 <select name="projectversion" id="projectversion">
25 {% for release in releases %} 25 {% for release in releases %}
26 <option value="{{release.id}}"{%if projectversion == release.id %} selected{%endif%}>{{release.description}} ({{release.name}})</option> 26 <option value="{{release.id}}"{%if projectversion == release.id %} selected{%endif%}>{{release.description}}</option>
27 {% endfor %} 27 {% endfor %}
28 </select> 28 </select>
29 {% for release in releases %} 29 {% for release in releases %}
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html
index 0b2821cdf6..fdfc3af9fb 100644
--- a/bitbake/lib/toaster/toastergui/templates/project.html
+++ b/bitbake/lib/toaster/toastergui/templates/project.html
@@ -350,13 +350,13 @@ vim: expandtab tabstop=2
350 <i class="icon-question-sign get-help heading-help" title="The version of the build system you want to use"></i> 350 <i class="icon-question-sign get-help heading-help" title="The version of the build system you want to use"></i>
351 </h3> 351 </h3>
352 <p class="lead" id="change-project-version-opposite"> 352 <p class="lead" id="change-project-version-opposite">
353 <span id="project-version">{[project.release.name]}</span> 353 <span id="project-version">{[project.release.desc]}</span>
354 <i id="change-version" class="icon-pencil" ng-click="toggle('#change-project-version')" ></i> 354 <i id="change-version" class="icon-pencil" ng-click="toggle('#change-project-version')" ></i>
355 </p> 355 </p>
356 <div class="div-inline" id="change-project-version" style="display:none;"> 356 <div class="div-inline" id="change-project-version" style="display:none;">
357 <form ng-submit="test('#change-project-version')" class="input-append"> 357 <form ng-submit="test('#change-project-version')" class="input-append">
358 <select id="select-version" ng-model="projectVersion"> 358 <select id="select-version" ng-model="projectVersion">
359 <option ng-repeat="r in releases" value="{[r.id]}" ng-selected="r.id == project.release.id">{[r.name]}</option> 359 <option ng-repeat="r in releases" value="{[r.id]}" ng-selected="r.id == project.release.id">{[r.description]}</option>
360 </select> 360 </select>
361 <input type="submit" class="btn" style="margin-left:5px;" value="Save" ng-disabled="project.release.id == projectVersion"/> 361 <input type="submit" class="btn" style="margin-left:5px;" value="Save" ng-disabled="project.release.id == projectVersion"/>
362 <input type="reset" class="btn btn-link" value="Cancel" ng-click="toggle('#change-project-version')" ng-disabled="project.release.id == projectVersion"/> 362 <input type="reset" class="btn btn-link" value="Cancel" ng-click="toggle('#change-project-version')" ng-disabled="project.release.id == projectVersion"/>
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 49a7769cdb..8301f6ce66 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -1893,7 +1893,7 @@ if toastermain.settings.MANAGED:
1893 context = { 1893 context = {
1894 'email': request.user.email if request.user.is_authenticated() else '', 1894 'email': request.user.email if request.user.is_authenticated() else '',
1895 'username': request.user.username if request.user.is_authenticated() else '', 1895 'username': request.user.username if request.user.is_authenticated() else '',
1896 'releases': Release.objects.order_by("id"), 1896 'releases': Release.objects.order_by("description"),
1897 } 1897 }
1898 1898
1899 try: 1899 try:
@@ -2016,7 +2016,7 @@ if toastermain.settings.MANAGED:
2016 prj.projectlayer_set.all().order_by("id")), 2016 prj.projectlayer_set.all().order_by("id")),
2017 "targets" : map(lambda x: {"target" : x.target, "task" : x.task, "pk": x.pk}, prj.projecttarget_set.all()), 2017 "targets" : map(lambda x: {"target" : x.target, "task" : x.task, "pk": x.pk}, prj.projecttarget_set.all()),
2018 "freqtargets": freqtargets, 2018 "freqtargets": freqtargets,
2019 "releases": map(lambda x: {"id": x.pk, "name": x.name}, Release.objects.all()), 2019 "releases": map(lambda x: {"id": x.pk, "name": x.name, "description":x.description}, Release.objects.all()),
2020 } 2020 }
2021 try: 2021 try:
2022 context["machine"] = {"name": prj.projectvariable_set.get(name="MACHINE").value} 2022 context["machine"] = {"name": prj.projectvariable_set.get(name="MACHINE").value}