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]

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>

diff --git a/lib/toaster/toastergui/templates/newproject.html b/lib/toaster/toastergui/templates/newproject.html
index 512a8fa68f409ac8b97f3a0b5c91998ab5f98421..0265564762071cbbb5492492d646fff8419a57b0 100644 (file)
--- a/lib/toaster/toastergui/templates/newproject.html
+++ b/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>