summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/toastergui/tables.py30
1 files changed, 27 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py
index 969eb04aaa..e2d23c1e81 100644
--- a/bitbake/lib/toaster/toastergui/tables.py
+++ b/bitbake/lib/toaster/toastergui/tables.py
@@ -114,8 +114,12 @@ class LayersTable(ToasterTable):
114 114
115 git_url_template = ''' 115 git_url_template = '''
116 <a href="{% url 'layerdetails' extra.pid data.id %}"> 116 <a href="{% url 'layerdetails' extra.pid data.id %}">
117 {% if data.layer.local_source_dir %}
118 <code>{{data.layer.local_source_dir}}</code>
119 {% else %}
117 <code>{{data.layer.vcs_url}}</code> 120 <code>{{data.layer.vcs_url}}</code>
118 </a> 121 </a>
122 {% endif %}
119 {% if data.get_vcs_link_url %} 123 {% if data.get_vcs_link_url %}
120 <a target="_blank" href="{{ data.get_vcs_link_url }}"> 124 <a target="_blank" href="{{ data.get_vcs_link_url }}">
121 <span class="glyphicon glyphicon-new-window"></span> 125 <span class="glyphicon glyphicon-new-window"></span>
@@ -123,16 +127,21 @@ class LayersTable(ToasterTable):
123 {% endif %} 127 {% endif %}
124 ''' 128 '''
125 129
126 self.add_column(title="Git repository URL", 130 self.add_column(title="Layer source code location",
127 help_text="The Git repository for the layer source code", 131 help_text="A Git repository or an absolute path to a directory",
128 hidden=True, 132 hidden=True,
129 static_data_name="layer__vcs_url", 133 static_data_name="layer__vcs_url",
130 static_data_template=git_url_template) 134 static_data_template=git_url_template)
131 135
132 git_dir_template = ''' 136 git_dir_template = '''
137 {% if data.layer.local_source_dir %}
138 <span class="text-muted">Not applicable</span>
139 <span class="glyphicon glyphicon-question-sign get-help" data-original-title="" title="The source code of {{data.layer.name}} is not in a Git repository, so there is no subdirectory associated with it"> </span>
140 {% else %}
133 <a href="{% url 'layerdetails' extra.pid data.id %}"> 141 <a href="{% url 'layerdetails' extra.pid data.id %}">
134 <code>{{data.dirpath}}</code> 142 <code>{{data.dirpath}}</code>
135 </a> 143 </a>
144 {% endif %}
136 {% if data.dirpath and data.get_vcs_dirpath_link_url %} 145 {% if data.dirpath and data.get_vcs_dirpath_link_url %}
137 <a target="_blank" href="{{ data.get_vcs_dirpath_link_url }}"> 146 <a target="_blank" href="{{ data.get_vcs_dirpath_link_url }}">
138 <span class="glyphicon glyphicon-new-window"></span> 147 <span class="glyphicon glyphicon-new-window"></span>
@@ -146,9 +155,14 @@ class LayersTable(ToasterTable):
146 static_data_template=git_dir_template) 155 static_data_template=git_dir_template)
147 156
148 revision_template = ''' 157 revision_template = '''
158 {% if data.layer.local_source_dir %}
159 <span class="text-muted">Not applicable</span>
160 <span class="glyphicon glyphicon-question-sign get-help" data-original-title="" title="The source code of {{data.layer.name}} is not in a Git repository, so there is no revision associated with it"> </span>
161 {% else %}
149 {% with vcs_ref=data.get_vcs_reference %} 162 {% with vcs_ref=data.get_vcs_reference %}
150 {% include 'snippets/gitrev_popover.html' %} 163 {% include 'snippets/gitrev_popover.html' %}
151 {% endwith %} 164 {% endwith %}
165 {% endif %}
152 ''' 166 '''
153 167
154 self.add_column(title="Git revision", 168 self.add_column(title="Git revision",
@@ -413,9 +427,19 @@ class RecipesTable(ToasterTable):
413 orderable=True, 427 orderable=True,
414 field_name="license") 428 field_name="license")
415 429
430 revision_link_template = '''
431 {% if data.layer_version.layer.local_source_dir %}
432 <span class="text-muted">Not applicable</span>
433 <span class="glyphicon glyphicon-question-sign get-help" data-original-title="" title="The source code of {{data.layer_version.layer.name}} is not in a Git repository, so there is no revision associated with it"> </span>
434 {% else %}
435 {{data.layer_version.get_vcs_reference}}
436 {% endif %}
437 '''
438
416 self.add_column(title="Git revision", 439 self.add_column(title="Git revision",
417 hidden=True, 440 hidden=True,
418 field_name="layer_version__get_vcs_reference") 441 static_data_name="layer_version__get_vcs_reference",
442 static_data_template=revision_link_template)
419 443
420 444
421class LayerRecipesTable(RecipesTable): 445class LayerRecipesTable(RecipesTable):