[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1833/8267] bitbake: toaster: update recipe details page



commit f5acb4213ba319e5dc784616dedec9d2896224ca
Author: Sujith H <sujith h gmail com>
Date:   Fri Jul 29 10:42:30 2016 +0000

    bitbake: toaster: update recipe details page
    
    Update Layer branch and Layer commit
    in recipe details page. For local layer
    imported from toaster these fields are
    not applicable.
    
    [YOCO #9911]
    
    (Bitbake rev: 35f7faabff17ca577fdd2e84bb25125047f66345)
    
    Signed-off-by: Sujith H <sujith h gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../lib/toaster/toastergui/templates/recipe.html   |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/bitbake/lib/toaster/toastergui/templates/recipe.html 
b/bitbake/lib/toaster/toastergui/templates/recipe.html
index 97e7b99..bf2cd71 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipe.html
+++ b/bitbake/lib/toaster/toastergui/templates/recipe.html
@@ -69,21 +69,37 @@
                     Recipe file
                 </dt>
                 <dd><code>{{object.file_path}} {% if object.pathflags %}<i>({{object.pathflags}})</i>{% 
endif %}</code></dd>
-                {% if layer_version.branch %}
                 <dt>
                     <span class="glyphicon glyphicon-question-sign get-help"
                         title="The Git branch of the layer providing the
                     recipe"></span>
                     Layer branch
                 </dt>
+                {% if layer_version.layer.local_source_dir %}
+                <dd>
+                 <span class="text-muted">Not applicable</span>
+                 <span class="glyphicon glyphicon-question-sign get-help" title="The source
+                  code of {{layer_version.layer.name}} is not in a git repository
+                  so there is no branch associated with it"></span>
+                </dd>
+                {% else %}
                 <dd>{{layer_version.branch}}</dd>
-                {% endif %}
+               {% endif %}
                 <dt>
                     <span class="glyphicon glyphicon-question-sign get-help" title="The Git
                         commit of the layer providing the recipe"></span>
                     Layer commit
                 </dt>
+                {% if layer_version.layer.local_source_dir %}
+               <dd>
+                 <span class="text-muted">Not applicable</span>
+                 <span class="glyphicon glyphicon-question-sign get-help" title="The source
+                  code of {{layer_version.layer.name}} is not in a git repository
+                  so there is no commit associated with it"></span>
+               </dd>
+                {% else %}
                 <dd class="iscommit">{{layer_version.commit}}</dd>
+               {% endif %}
                 {% if object.provides_set.all %}
                 <dt>
                     <span class="glyphicon glyphicon-question-sign get-help"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]