[gentoo-commits] proj/tinderbox-cluster-www:master commit in: python/tbc_www/

[gentoo-commits] proj/tinderbox-cluster-www:master commit in: python/tbc_www/

[Magnus Granberg]

commit:     58736e935b2ece00e47cb380481c5a935f340c82
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 17 06:20:12 2015 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Fri Jul 17 06:20:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster-www.git/commit/?id=58736e93

fix a error to display setup/profiles in new build requests in home

 python/tbc_www/models.py | 3 ++-
 python/tbc_www/views.py  | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/python/tbc_www/models.py b/python/tbc_www/models.py
index fc91a8b..04a3bb8 100644
--- a/python/tbc_www/models.py
+++ b/python/tbc_www/models.py
@@ -100,6 +100,7 @@ class Configs(models.Model):
 class BuildJobs(models.Model):
 	BuildJobId = models.AutoField(primary_key=True, db_column='build_job_id')
 	EbuildId = models.ForeignKey(Ebuilds, db_column='ebuild_id')
+	SetupId = models.ForeignKey(Setups, db_column='setup_id')
 	ConfigId = models.ForeignKey(Configs, db_column='config_id')
 	Status = models.CharField(max_length=21, db_column='status')
 	BuildNow = models.BooleanField(db_column='build_now')
@@ -108,7 +109,7 @@ class BuildJobs(models.Model):
 	class Meta:
 		db_table = 'build_jobs'
 	def __str__(self):
-		return '%s %s %s %s %s %s %s' % (self.BuildJobId, self.EbuildId, self.ConfigId, self.Status, self.BuildNow, self.RemoveBin, self.TimeStamp)
+		return '%s %s %s %s %s %s %s %s' % (self.BuildJobId, self.EbuildId, self.SetupId, self.ConfigId, self.Status, self.BuildNow, self.RemoveBin, self.TimeStamp)
 
 class Uses(models.Model):
 	UseId = models.IntegerField(primary_key=True, db_column='use_id')

diff --git a/python/tbc_www/views.py b/python/tbc_www/views.py
index 108a653..dcc89d4 100644
--- a/python/tbc_www/views.py
+++ b/python/tbc_www/views.py
@@ -5,7 +5,7 @@ from django.shortcuts import render, get_object_or_404, HttpResponseRedirect
 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,  \
+from tbc_www.models import EbuildsMetadata, BuildLogs, BuildJobs, BuildLogsRepomanQa, \
 	BuildJobsUse
 
 import re
@@ -42,9 +42,7 @@ def home(request):
 		adict2['P'] = BJ.EbuildId.PackageId.Package
 		adict2['V'] = BJ.EbuildId.Version
 		adict2['R'] = BJ.EbuildId.PackageId.RepoId.Repo
-		adict2['Profile'] = BJ.ConfigId.SetupId.Profile
-		adict2['Setup'] = BJ.ConfigId.SetupId.Setup
-		adict2['title'] = "Setup: " + BJ.ConfigId.SetupId.Setup + "\n" + "Profile: " + BJ.ConfigId.SetupId.Profile + "\n"
+		adict2['title'] = "Setup: " + BJ.SetupId.Setup + "\n" + "Profile: " + BJ.SetupId.Profile + "\n"
 		BJU = BuildJobsUse.objects.filter(BuildJobId = BJ.BuildJobId)
 		if not BJU == []:
 			use_enable = []

[gentoo-commits] proj/tinderbox-cluster-www:master commit in: python/tbc_www/

[Magnus Granberg]

commit:     cb322ccb29e1a6dd74c0381628f749ca7d5f9de6
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 16:35:44 2016 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 16:35:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster-www.git/commit/?id=cb322ccb

change from checksum to mtime on Manifest

 python/tbc_www/models.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/python/tbc_www/models.py b/python/tbc_www/models.py
index e864cf8..dda8c3b 100644
--- a/python/tbc_www/models.py
+++ b/python/tbc_www/models.py
@@ -36,13 +36,13 @@ class Packages(models.Model):
 	CategoryId = models.ForeignKey(Categories, db_column='category_id')
 	Package = models.CharField(max_length=150, db_column='package')
 	RepoId = models.ForeignKey(Repos, db_column='repo_id')
-	Checksum = models.CharField(max_length=100, db_column='checksum')
+	Mtime = models.DateTimeField(db_column='mtime')
 	Active = models.BooleanField(db_column='active')
 	TimeStamp = models.DateTimeField(db_column='time_stamp')
 	class Meta:
 		db_table = 'packages'
 	def __str__(self):
-		return '%s %s %s %s %s %s %s' % (self.PackageId, self.CategoryId, self.Package, self.RepoId, self.Checksum, self.Active, self.TimeStamp)
+		return '%s %s %s %s %s %s %s' % (self.PackageId, self.CategoryId, self.Package, self.RepoId, self.Mtime, self.Active, self.TimeStamp)
 
 class PackagesMetadata(models.Model):
 	Id =  models.IntegerField(primary_key=True, db_column='id')
@@ -52,7 +52,7 @@ class PackagesMetadata(models.Model):
 	class Meta:
 		db_table = 'packages_metadata'
 	def __str__(self):
-		return '%s %s %s %s' % (self.Id, self.PackageId, self.Changlog, self.Descriptions)
+		return '%s %s %s %s' % (self.Id, self.PackageId, self.Gitlog, self.Descriptions)
 
 class Ebuilds(models.Model):
 	EbuildId = models.IntegerField(primary_key=True, db_column='ebuild_id')
@@ -75,7 +75,7 @@ class EbuildsMetadata(models.Model):
 	class Meta:
 		db_table = 'ebuilds_metadata'
 	def __str__(self):
-		return '%s %s %s %s' % (self.Id, self.EbuildId, self.Revision, self.Descriptions)
+		return '%s %s %s %s' % (self.Id, self.EbuildId, self,Commit, self.New, self.Descriptions)
 
 class BuildLogs(models.Model):
 	BuildLogId = models.IntegerField(primary_key=True, db_column='build_log_id')

[gentoo-commits] proj/tinderbox-cluster-www:master commit in: python/tbc_www/

[Magnus Granberg]

commit:     a0a2a79a1d270562a219a0a3d2ff7c40df42ea44
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 15:02:20 2016 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 15:02:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster-www.git/commit/?id=a0a2a79a

remove mtime in the package model

 python/tbc_www/models.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/python/tbc_www/models.py b/python/tbc_www/models.py
index dda8c3b..81f7c59 100644
--- a/python/tbc_www/models.py
+++ b/python/tbc_www/models.py
@@ -36,13 +36,12 @@ class Packages(models.Model):
 	CategoryId = models.ForeignKey(Categories, db_column='category_id')
 	Package = models.CharField(max_length=150, db_column='package')
 	RepoId = models.ForeignKey(Repos, db_column='repo_id')
-	Mtime = models.DateTimeField(db_column='mtime')
 	Active = models.BooleanField(db_column='active')
 	TimeStamp = models.DateTimeField(db_column='time_stamp')
 	class Meta:
 		db_table = 'packages'
 	def __str__(self):
-		return '%s %s %s %s %s %s %s' % (self.PackageId, self.CategoryId, self.Package, self.RepoId, self.Mtime, self.Active, self.TimeStamp)
+		return '%s %s %s %s %s %s %s' % (self.PackageId, self.CategoryId, self.Package, self.RepoId, self.Active, self.TimeStamp)
 
 class PackagesMetadata(models.Model):
 	Id =  models.IntegerField(primary_key=True, db_column='id')

[gentoo-commits] proj/tinderbox-cluster-www:master commit in: python/tbc_www/

[Magnus Granberg]

commit:     11d166a0b90d591b1e18efac99d1b729c6d30678
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 18:04:01 2017 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 18:04:01 2017 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster-www.git/commit/?id=11d166a0

fix ame 'adict' is not defined line 273

 python/tbc_www/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/tbc_www/views.py b/python/tbc_www/views.py
index 305ed8c..c272c50 100644
--- a/python/tbc_www/views.py
+++ b/python/tbc_www/views.py
@@ -270,7 +270,7 @@ def new_logs(request):
 		adict2['Fail'] = BL.Fail
 		adict2['SummeryText'] = BL.SummeryText
 		if BL.Fail:
-			adict['FI'] = fail_status(BL.BuildLogId)
+			adict2['FI'] = fail_status(BL.BuildLogId)
 		alist.append(adict2)
 	TmpDict['BL_tmp'] = alist
 	TmpDict['QA_tmp'] = BuildLogsQa.objects.filter(BuildLogId__New = True)