diff options
Diffstat (limited to 'bitbake/lib/toaster/orm/models.py')
-rw-r--r-- | bitbake/lib/toaster/orm/models.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 2132f8799c..eea98b5e71 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py | |||
@@ -52,7 +52,7 @@ class ToasterSetting(models.Model): | |||
52 | value = models.CharField(max_length=255) | 52 | value = models.CharField(max_length=255) |
53 | 53 | ||
54 | def __unicode__(self): | 54 | def __unicode__(self): |
55 | return "Setting %s" % self.name | 55 | return "Setting %s = " % (self.name, self.value) |
56 | 56 | ||
57 | class ProjectManager(models.Manager): | 57 | class ProjectManager(models.Manager): |
58 | def create_project(self, name, release): | 58 | def create_project(self, name, release): |
@@ -100,7 +100,7 @@ class Project(models.Model): | |||
100 | objects = ProjectManager() | 100 | objects = ProjectManager() |
101 | 101 | ||
102 | def __unicode__(self): | 102 | def __unicode__(self): |
103 | return "%s (%s, %s)" % (self.name, self.release, self.bitbake_version) | 103 | return "%s (Release %s, BBV %s)" % (self.name, self.release, self.bitbake_version) |
104 | 104 | ||
105 | def get_current_machine_name(self): | 105 | def get_current_machine_name(self): |
106 | try: | 106 | try: |
@@ -896,7 +896,7 @@ class BitbakeVersion(models.Model): | |||
896 | dirpath = models.CharField(max_length=255) | 896 | dirpath = models.CharField(max_length=255) |
897 | 897 | ||
898 | def __unicode__(self): | 898 | def __unicode__(self): |
899 | return "%s (%s)" % (self.name, self.branch) | 899 | return "%s (Branch: %s)" % (self.name, self.branch) |
900 | 900 | ||
901 | 901 | ||
902 | class Release(models.Model): | 902 | class Release(models.Model): |
@@ -1055,8 +1055,10 @@ class Layer_Version(models.Model): | |||
1055 | 1055 | ||
1056 | # raise Exception(candidate_layer_versions) | 1056 | # raise Exception(candidate_layer_versions) |
1057 | 1057 | ||
1058 | release_priorities = map(lambda x: (x.layer_source_id, x.priority), project.release.releaselayersourcepriority_set.all().order_by("-priority")) | 1058 | release_priorities = {} |
1059 | 1059 | ||
1060 | for ls_id, prio in map(lambda x: (x.layer_source_id, x.priority), project.release.releaselayersourcepriority_set.all().order_by("-priority")): | ||
1061 | release_priorities[ls_id] = prio | ||
1060 | 1062 | ||
1061 | def _get_ls_priority(ls): | 1063 | def _get_ls_priority(ls): |
1062 | # if there is no layer source, we have minus infinite priority, as we don't want this layer selected | 1064 | # if there is no layer source, we have minus infinite priority, as we don't want this layer selected |
@@ -1081,7 +1083,7 @@ class Layer_Version(models.Model): | |||
1081 | raise Exception("Cannot determine the vcs_reference for layer version %s" % vars(self)) | 1083 | raise Exception("Cannot determine the vcs_reference for layer version %s" % vars(self)) |
1082 | 1084 | ||
1083 | def __unicode__(self): | 1085 | def __unicode__(self): |
1084 | return str(self.layer) + "(%s,%s)" % (self.get_vcs_reference(), self.build.project if self.build is not None else "None") | 1086 | return "%d %s (VCS %s, Project %s)" % (self.pk, str(self.layer), self.get_vcs_reference(), self.build.project if self.build is not None else "No project") |
1085 | 1087 | ||
1086 | class Meta: | 1088 | class Meta: |
1087 | unique_together = ("layer_source", "up_id") | 1089 | unique_together = ("layer_source", "up_id") |