diff options
| author |   David Reyna <David.Reyna@windriver.com> | 2018-10-15 00:14:17 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-17 12:24:05 +0100 |
| commit | e43ff061b03878057e49c44aa3ee2e4c7a5d5503 (patch) | |
| tree | 5d96d780aac5a36e1e6ac364254d38fb8865e24b | |
| parent | c0a23dd9155c50a6b7df796980bc7b612cac7994 (diff) | |
| download | bitbake-e43ff061b03878057e49c44aa3ee2e4c7a5d5503.tar.gz | |
toaster: bad link for distro conf file
The distro source path link is missing "conf/distro/", and the
display is using the machine link instead of the distro link.
[YOCTO #12957]
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/toaster/orm/models.py | 2 | ||||
| -rw-r--r-- | lib/toaster/toastergui/tables.py | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py index 849c22eed..772029021 100644 --- a/lib/toaster/orm/models.py +++ b/lib/toaster/orm/models.py @@ -1877,7 +1877,7 @@ class Distro(models.Model): description = models.CharField(max_length=255) def get_vcs_distro_file_link_url(self): - path = self.name+'.conf' + path = 'conf/distro/%s.conf' % self.name return self.layer_version.get_vcs_file_link_url(path) def __unicode__(self): diff --git a/lib/toaster/toastergui/tables.py b/lib/toaster/toastergui/tables.py index 03bd2ae9c..9ff756bc8 100644 --- a/lib/toaster/toastergui/tables.py +++ b/lib/toaster/toastergui/tables.py @@ -1615,14 +1615,12 @@ class DistrosTable(ToasterTable): hidden=True, field_name="layer_version__get_vcs_reference") - wrtemplate_file_template = '''<code>conf/machine/{{data.name}}.conf</code> - <a href="{{data.get_vcs_machine_file_link_url}}" target="_blank"><span class="glyphicon glyphicon-new-window"></i></a>''' - + distro_file_template = '''<code>conf/distro/{{data.name}}.conf</code> + {% if 'None' not in data.get_vcs_distro_file_link_url %}<a href="{{data.get_vcs_distro_file_link_url}}" target="_blank"><span class="glyphicon glyphicon-new-window"></i></a>{% endif %}''' self.add_column(title="Distro file", hidden=True, static_data_name="templatefile", - static_data_template=wrtemplate_file_template) - + static_data_template=distro_file_template) self.add_column(title="Select", help_text="Sets the selected distro to the project", |