diff options
| -rw-r--r-- | lib/toaster/orm/models.py | 8 | ||||
| -rw-r--r-- | lib/toaster/toastergui/templates/recipes.html | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py index 4a6ca8f2b..b9bb896b5 100644 --- a/lib/toaster/orm/models.py +++ b/lib/toaster/orm/models.py @@ -557,7 +557,13 @@ class Recipe(models.Model): def get_local_path(self): if settings.MANAGED and self.layer_version.build.project is not None: - return self.file_path[len(self.layer_version.layer.local_path)+1:] + # strip any tag prefixes ('virtual:native:') + layer_path=self.layer_version.layer.local_path.split(":")[-1] + recipe_path=self.file_path.split(":")[-1] + if 0 == recipe_path.find(layer_path): + return recipe_path[len(layer_path)+1:] + else: + return recipe_path return self.file_path diff --git a/lib/toaster/toastergui/templates/recipes.html b/lib/toaster/toastergui/templates/recipes.html index 889e676b4..458d72456 100644 --- a/lib/toaster/toastergui/templates/recipes.html +++ b/lib/toaster/toastergui/templates/recipes.html @@ -80,7 +80,7 @@ {% endwith %} </td> <!-- Recipe file --> - <td class="recipe_file">{{recipe.file_path}}</td> + <td class="recipe_file">{{recipe.get_local_path}}</td> <!-- Section --> <td class="recipe_section">{{recipe.section}}</td> <!-- License --> |