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 7b69ecd09e..1f2e07f50b 100644 --- a/bitbake/lib/toaster/bldcollector/admin.py +++ b/bitbake/lib/toaster/bldcollector/admin.py | |||
@@ -1,29 +1,33 @@ | |||
1 | from django.contrib import admin | 1 | from django.contrib import admin |
2 | from django.contrib.admin.filters import RelatedFieldListFilter | 2 | from orm.models import BitbakeVersion, Release, ToasterSetting, Layer_Version |
3 | from orm.models import BitbakeVersion, Release, ToasterSetting | ||
4 | from django.forms.widgets import Textarea | ||
5 | from django import forms | 3 | from django import forms |
6 | import django.db.models as models | 4 | import django.db.models as models |
7 | 5 | ||
8 | from django.contrib.admin import widgets, helpers | ||
9 | 6 | ||
10 | class BitbakeVersionAdmin(admin.ModelAdmin): | 7 | class BitbakeVersionAdmin(admin.ModelAdmin): |
11 | 8 | ||
12 | # we override the formfield for db URLField because of broken URL validation | 9 | # we override the formfield for db URLField |
10 | # because of broken URL validation | ||
13 | 11 | ||
14 | def formfield_for_dbfield(self, db_field, **kwargs): | 12 | def formfield_for_dbfield(self, db_field, **kwargs): |
15 | if isinstance(db_field, models.fields.URLField): | 13 | if isinstance(db_field, models.fields.URLField): |
16 | return forms.fields.CharField() | 14 | return forms.fields.CharField() |
17 | return super(BitbakeVersionAdmin, self).formfield_for_dbfield(db_field, **kwargs) | 15 | return super(BitbakeVersionAdmin, self).formfield_for_dbfield( |
18 | 16 | db_field, **kwargs) | |
19 | 17 | ||
20 | 18 | ||
21 | class ReleaseAdmin(admin.ModelAdmin): | 19 | class ReleaseAdmin(admin.ModelAdmin): |
22 | pass | 20 | pass |
23 | 21 | ||
22 | |||
24 | class ToasterSettingAdmin(admin.ModelAdmin): | 23 | class ToasterSettingAdmin(admin.ModelAdmin): |
25 | pass | 24 | pass |
26 | 25 | ||
26 | |||
27 | class LayerVersionsAdmin(admin.ModelAdmin): | ||
28 | pass | ||
29 | |||
30 | admin.site.register(Layer_Version, LayerVersionsAdmin) | ||
27 | admin.site.register(BitbakeVersion, BitbakeVersionAdmin) | 31 | admin.site.register(BitbakeVersion, BitbakeVersionAdmin) |
28 | admin.site.register(Release, ReleaseAdmin) | 32 | admin.site.register(Release, ReleaseAdmin) |
29 | admin.site.register(ToasterSetting, ToasterSettingAdmin) | 33 | admin.site.register(ToasterSetting, ToasterSettingAdmin) |
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 72b9dfeaa8..caacc2a544 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py | |||
@@ -1252,6 +1252,9 @@ class Release(models.Model): | |||
1252 | def __unicode__(self): | 1252 | def __unicode__(self): |
1253 | return "%s (%s)" % (self.name, self.branch_name) | 1253 | return "%s (%s)" % (self.name, self.branch_name) |
1254 | 1254 | ||
1255 | def __str__(self): | ||
1256 | return self.name | ||
1257 | |||
1255 | class ReleaseDefaultLayer(models.Model): | 1258 | class ReleaseDefaultLayer(models.Model): |
1256 | release = models.ForeignKey(Release) | 1259 | release = models.ForeignKey(Release) |
1257 | layer_name = models.CharField(max_length=100, default="") | 1260 | layer_name = models.CharField(max_length=100, default="") |
@@ -1419,6 +1422,14 @@ class Layer_Version(models.Model): | |||
1419 | def __unicode__(self): | 1422 | def __unicode__(self): |
1420 | return ("id %d belongs to layer: %s" % (self.pk, self.layer.name)) | 1423 | return ("id %d belongs to layer: %s" % (self.pk, self.layer.name)) |
1421 | 1424 | ||
1425 | def __str__(self): | ||
1426 | if self.release: | ||
1427 | release = self.release.name | ||
1428 | else: | ||
1429 | release = "No release set" | ||
1430 | |||
1431 | return "%d %s (%s)" % (self.pk, self.layer.name, release) | ||
1432 | |||
1422 | 1433 | ||
1423 | class LayerVersionDependency(models.Model): | 1434 | class LayerVersionDependency(models.Model): |
1424 | 1435 | ||