summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/toaster/bldcollector/admin.py18
-rw-r--r--bitbake/lib/toaster/orm/models.py11
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 @@
1from django.contrib import admin 1from django.contrib import admin
2from django.contrib.admin.filters import RelatedFieldListFilter 2from orm.models import BitbakeVersion, Release, ToasterSetting, Layer_Version
3from orm.models import BitbakeVersion, Release, ToasterSetting
4from django.forms.widgets import Textarea
5from django import forms 3from django import forms
6import django.db.models as models 4import django.db.models as models
7 5
8from django.contrib.admin import widgets, helpers
9 6
10class BitbakeVersionAdmin(admin.ModelAdmin): 7class 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
21class ReleaseAdmin(admin.ModelAdmin): 19class ReleaseAdmin(admin.ModelAdmin):
22 pass 20 pass
23 21
22
24class ToasterSettingAdmin(admin.ModelAdmin): 23class ToasterSettingAdmin(admin.ModelAdmin):
25 pass 24 pass
26 25
26
27class LayerVersionsAdmin(admin.ModelAdmin):
28 pass
29
30admin.site.register(Layer_Version, LayerVersionsAdmin)
27admin.site.register(BitbakeVersion, BitbakeVersionAdmin) 31admin.site.register(BitbakeVersion, BitbakeVersionAdmin)
28admin.site.register(Release, ReleaseAdmin) 32admin.site.register(Release, ReleaseAdmin)
29admin.site.register(ToasterSetting, ToasterSettingAdmin) 33admin.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
1255class ReleaseDefaultLayer(models.Model): 1258class 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
1423class LayerVersionDependency(models.Model): 1434class LayerVersionDependency(models.Model):
1424 1435