commit: 65c8b3dcce64f5c865baa472c0307a07c1f9872b
Author: Magnus Granberg zorry AT gentoo DOT org
AuthorDate: Sun Jul 26 14:37:39 2015 +
Commit: Magnus Granberg zorry AT gentoo DOT org
CommitDate: Sun Jul 26 14:37:39 2015 +
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster-www.git/commit/?id=65c8b3dc
add ebuild info and fix listing of packages
python/tbc_www/models.py | 27 +
python/tbc_www/urls.py | 1 +
python/tbc_www/views.py| 40 --
python/templates/includes/frontpage/new_logs | 8 ++--
.../templates/pages/packages/category/index.html | 6 +--
.../pages/packages/ebuilds/ebuild/index.html | 47 ++
python/templates/pages/packages/index.html | 6 +--
7 files changed, 112 insertions(+), 23 deletions(-)
diff --git a/python/tbc_www/models.py b/python/tbc_www/models.py
index 621a7dc..2cb327a 100644
--- a/python/tbc_www/models.py
+++ b/python/tbc_www/models.py
@@ -175,6 +175,14 @@ class Keywords(models.Model):
def __str__(self):
return '%s %s' % (self.KeywordId, self.Keyword)
+class Restrictions(models.Model):
+ RestrictionId = models.IntegerField(primary_key=True,
db_column='restriction_id')
+ Restriction = models.CharField(max_length=150, db_column='restriction')
+ class Meta:
+ db_table = 'restrictions'
+ def __str__(self):
+ return '%s %s' % (self.RestrictionId, self.Restriction)
+
class EbuildsKeywords(models.Model):
Id = models.IntegerField(primary_key=True, db_column='id')
EbuildId = models.ForeignKey(Ebuilds, db_column='ebuild_id')
@@ -184,3 +192,22 @@ class EbuildsKeywords(models.Model):
db_table = 'ebuilds_keywords'
def __str__(self):
return '%s %s %s' % (self.EbuildId, self.KeywordId, self.Status)
+
+class EbuildsIuse(models.Model):
+ Id = models.IntegerField(primary_key=True, db_column='id')
+ EbuildId = models.ForeignKey(Ebuilds, db_column='ebuild_id')
+ UseId = models.ForeignKey(Uses, db_column='use_id')
+ Status =models.BooleanField(db_column='status')
+ class Meta:
+ db_table = 'ebuilds_iuse'
+ def __str__(self):
+ return '%s %s %s %s' % (self.Id, self.EbuildId, self.UseId,
self.Status)
+
+class EbuildsRestrictions(models.Model):
+ Id = models.IntegerField(primary_key=True, db_column='id')
+ EbuildId = models.ForeignKey(Ebuilds, db_column='ebuild_id')
+ RestrictionId = models.ForeignKey(Restrictions,
db_column='restriction_id')
+ class Meta:
+ db_table = 'ebuilds_restrictions'
+ def __str__(self):
+ return '%s %s' % (self.EbuildId, self.RestrictionId)
diff --git a/python/tbc_www/urls.py b/python/tbc_www/urls.py
index 193443f..4d50f40 100644
--- a/python/tbc_www/urls.py
+++ b/python/tbc_www/urls.py
@@ -5,5 +5,6 @@ urlpatterns = patterns('tbc_www.views',
url(r'^packages/$', 'categories'),
url(r'^categories/(?Pcategory_id\d+)/$', 'packages'),
url(r'^package/(?Ppackage_id\d+)/$', 'ebuilds'),
+ url(r'^ebuild/(?Pebuild_id\d+)/$', 'ebuild'),
url(r'^new/$', 'new_main'),
)
diff --git a/python/tbc_www/views.py b/python/tbc_www/views.py
index f68a706..5b719aa 100644
--- a/python/tbc_www/views.py
+++ b/python/tbc_www/views.py
@@ -7,7 +7,7 @@ from django.conf import settings
from gentoo_www.models import SiteSettings, Layout, Pages, SubPages, Sponsors,
Posts
from tbc_www.models import EbuildsMetadata, BuildLogs, BuildJobs,
BuildLogsRepomanQa, \
BuildJobsUse, Categories, CategoriesMetadata, Packages,
PackagesMetadata, Ebuilds, \
- Repos, EbuildsKeywords, BuildLogsErrors
+ Repos, EbuildsKeywords, BuildLogsErrors, EbuildsRestrictions,
EbuildsIuse
import re
def default_TmpDict(pagerequest):
@@ -32,9 +32,10 @@ def home(request):
Lines = 5
TmpDict = default_TmpDict(pagerequest)
TmpDict['EM'] = EbuildsMetadata.objects.filter(Revision =
'1.1').order_by('-Id')[:Lines]
- adict = {}
+ alist = []
for BL in BuildLogs.objects.order_by('-TimeStamp')[:Lines]:
adict2 = {}
+ adict2['BuildLogId'] = BL.BuildLogId
adict2['C'] = BL.EbuildId.PackageId.CategoryId.Category
adict2['P'] = BL.EbuildId.PackageId.Package
adict2['V'] = BL.EbuildId.Version
@@ -43,8 +44,8 @@ def home(request):
adict2['SummeryText'] = BL.SummeryText
if BL.Fail:
adict2['BE_tmp'] =
BuildLogsErrors.objects.filter(BuildLogId = BL.BuildLogId)
- adict[BL.BuildLogId] = adict2
- TmpDict['BL'] = adict
+ alist.append(adict2)
+ TmpDict['BL'] = alist
adict = {}
BJ_Tmp = BuildJobs.objects.order_by('-TimeStamp')[:Lines]
