diff options
| -rw-r--r-- | bitbake/lib/toaster/bldcollector/admin.py | 18 | ||||
| -rw-r--r-- | bitbake/lib/toaster/orm/models.py | 11 |
2 files changed, 22 insertions, 7 deletions
diff --git a/bitbake/lib/toaster/bldcollector/admin.py b/bitbake/lib/toaster/bldcollector/admin.py index 7b69ecd09e7..1f2e07f50bf 100644 --- a/bitbake/lib/toaster/bldcollector/admin.py +++ b/bitbake/lib/toaster/bldcollector/admin.py @@ -1,29 +1,33 @@ from django.contrib import admin -from django.contrib.admin.filters import RelatedFieldListFilter -from orm.models import BitbakeVersion, Release, ToasterSetting -from django.forms.widgets import Textarea +from orm.models import BitbakeVersion, Release, ToasterSetting, Layer_Version from django import forms import django.db.models as models -from django.contrib.admin import widgets, helpers class BitbakeVersionAdmin(admin.ModelAdmin): - # we override the formfield for db URLField because of broken URL validation + # we override the formfield for db URLField + # because of broken URL validation def formfield_for_dbfield(self, db_field, **kwargs): if isinstance(db_field, models.fields.URLField): return forms.fields.CharField() - return super(BitbakeVersionAdmin, self).formfield_for_dbfield(db_field, **kwargs) - + return super(BitbakeVersionAdmin, self).formfield_for_dbfield( + db_field, **kwargs) class ReleaseAdmin(admin.ModelAdmin): pass + class ToasterSettingAdmin(admin.ModelAdmin): pass + +class LayerVersionsAdmin(admin.ModelAdmin): + pass + +admin.site.register(Layer_Version, LayerVersionsAdmin) admin.site.register(BitbakeVersion, BitbakeVersionAdmin) admin.site.register(Release, ReleaseAdmin) admin.site.register(ToasterSetting, ToasterSettingAdmin) diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index b42071b8a7c..515d9119ec6 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -1097,6 +1097,9 @@ class Release(models.Model): def __unicode__(self): return "%s (%s)" % (self.name, self.branch_name) + def __str__(self): + return self.name + class ReleaseDefaultLayer(models.Model): release = models.ForeignKey(Release) layer_name = models.CharField(max_length=100, default="") @@ -1264,6 +1267,14 @@ class Layer_Version(models.Model): def __unicode__(self): return ("id %d belongs to layer: %s" % (self.pk, self.layer.name)) + def __str__(self): + if self.release: + release = self.release.name + else: + release = "No release set" + + return "%d %s (%s)" % (self.pk, self.layer.name, release) + class LayerVersionDependency(models.Model): |