From 8e3be3f268d96f65af8d6bf62162f71783afa478 Mon Sep 17 00:00:00 2001
From: Alexandru DAMIAN <alexandru.damian@intel.com>
Date: Tue, 20 Jan 2015 12:55:19 +0000
Subject: bitbake: toaster: newproject default release selection fix

This patch fixes the default project release selection to
obey the DEFAULT_RELEASE name set in ToasterSettings.

[YOCTO #7035]

(Bitbake rev: bcd7ba013b973d3b3ac1e0845acf60b80cb227c2)

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../toaster/toastergui/templates/newproject.html   | 32 +++++++++++++---------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'bitbake')

diff --git a/bitbake/lib/toaster/toastergui/templates/newproject.html b/bitbake/lib/toaster/toastergui/templates/newproject.html
index 512a8fa68f..0265564762 100644
--- a/bitbake/lib/toaster/toastergui/templates/newproject.html
+++ b/bitbake/lib/toaster/toastergui/templates/newproject.html
@@ -22,18 +22,24 @@
                 <i class="icon-question-sign get-help" title="The version of the build system you want to use"></i>
               </label>
               <select name="projectversion" id="projectversion">
-  {% for release in releases %}
-    <option value="{{release.id}}"{%if projectversion == release.id %} selected{%endif%}>{{release.description}}</option>
-  {% endfor %}
+          {% for release in releases %}
+            <option value="{{release.id}}"
+                {%if defaultbranch == release.name %}
+                selected
+            {%endif%}
+
+             >{{release.description}}</option>
+          {% endfor %}
               </select>
-  {% for release in releases %}
-    <div class="row-fluid helptext" id="description-{{release.id}}" style="display: none">
-        <span class="help-block span5">{{release.helptext|safe}}</span>
-    </div>
-  {% endfor %}
+         {% for release in releases %}
+             <div class="row-fluid helptext" id="description-{{release.id}}" style="display: none">
+                <span class="help-block span5">{{release.helptext|safe}}</span>
+           </div>
+         {% endfor %}
        {% else %}
-    <input type="hidden" name="projectversion" value="{{releases.0.id}}"/>
+        <input type="hidden" name="projectversion" value="{{releases.0.id}}"/>
        {% endif %}
+
             </fieldset>
 
             <div class="form-actions">
@@ -82,11 +88,11 @@
             $("#description-" + selected_release).show();
 
 
-			$('select').change(function(){
-				var new_release = $('select').val();
+            $('select').change(function(){
+                var new_release = $('select').val();
                 $(".helptext").hide();
-				$('#description-' + new_release).fadeIn();
-			});
+                $('#description-' + new_release).fadeIn();
+            });
         })
     </script>
 </div>
-- 
cgit v1.2.3-54-g00ecf