diff options
Diffstat (limited to 'python/tbc_www/views.py')
| -rw-r--r-- | python/tbc_www/views.py | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/python/tbc_www/views.py b/python/tbc_www/views.py index 7e99671..ff9a201 100644 --- a/python/tbc_www/views.py +++ b/python/tbc_www/views.py @@ -5,9 +5,9 @@ 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, BuildLogsQa, \ BuildJobsUse, Categories, CategoriesMetadata, Packages, PackagesMetadata, Ebuilds, \ - Repos, EbuildsKeywords, BuildLogsErrors, EbuildsRestrictions, EbuildsIuse + Repos, EbuildsKeywords, BuildLogsErrors, EbuildsRestrictions, EbuildsIuse, PackagesRepoman import re def default_TmpDict(pagerequest): @@ -29,7 +29,7 @@ def default_TmpDict(pagerequest): def home(request): pagerequest = 'home' - Lines = 5 + Lines = 10 TmpDict = default_TmpDict(pagerequest) TmpDict['EM'] = EbuildsMetadata.objects.filter(Revision = '1.1').order_by('-Id')[:Lines] alist = [] @@ -77,7 +77,8 @@ def home(request): adict2['title'] = adict2['title'] + "\n" adict[BJ.BuildJobId] = adict2 TmpDict['BJ'] = adict - TmpDict['RM'] = BuildLogsRepomanQa.objects.order_by('-Id')[:Lines] + TmpDict['QA_tmp'] = BuildLogsQa.objects.order_by('-Id')[:Lines/2] + TmpDict['PR_tmp'] = PackagesRepoman.objects.order_by('-Id')[:Lines/2] return render(request, 'pages/' + pagerequest + '/index.html', TmpDict) def categories(request): @@ -107,6 +108,12 @@ def packages(request, category_id): adict['Package'] = PM.PackageId.Package adict['Descriptions'] = PM.Descriptions adict['Changlog'] =PM.Changlog + try: + PackagesRepoman.objects.get(PackageId__PackageId = PM.PackageId.PackageId) + except PackagesRepoman.DoesNotExist as e: + adict['Repoman'] = False + else: + adict['Repoman'] = True ebuilds = [] for E in Ebuilds.objects.filter(Active = True).filter(PackageId__Package = PM.PackageId.Package): ebuilds.append(E.Version + '::' + E.PackageId.RepoId.Repo + '\n') @@ -119,11 +126,16 @@ def packages(request, category_id): def ebuilds(request, package_id): pagerequest = 'packages' TmpDict = default_TmpDict(pagerequest) - P = get_object_or_404(PackagesMetadata, PackageId__PackageId = package_id) + P = get_object_or_404(PackagesMetadata, PackageId__PackageId = package_id) TmpDict['P'] = P TmpDict['EM_tmp'] = EbuildsMetadata.objects.filter(EbuildId__Active = True).filter(EbuildId__PackageId__Package = P.PackageId.Package) TmpDict['EK_tmp'] = EbuildsKeywords.objects.filter(EbuildId__Active = True).filter(EbuildId__PackageId__Package = P.PackageId.Package) - + try: + PackagesRepoman.objects.get(PackageId__PackageId = package_id) + except PackagesRepoman.DoesNotExist as e: + TmpDict['PR'] = False + else: + TmpDict['PR'] = True return render(request, 'pages/' + pagerequest + '/ebuilds/index.html', TmpDict) def ebuild(request, ebuild_id): @@ -188,12 +200,14 @@ def new_main(request): adict2['title'] = adict2['title'] + "\n" adict[BJ.BuildJobId] = adict2 TmpDict['BJ'] = adict - TmpDict['RM'] = BuildLogsRepomanQa.objects.order_by('-Id')[:Lines] + TmpDict['QA_tmp'] = BuildLogsQa.objects.order_by('-Id')[:Lines/2] + TmpDict['PR_tmp'] = PackagesRepoman.objects.order_by('-Id')[:Lines/2] return render(request, 'pages/' + pagerequest + '/index.html', TmpDict) def new_repomanqa(request): pagerequest = 'new' Lines = 30 TmpDict = default_TmpDict(pagerequest) - TmpDict['RM_tmp'] = BuildLogsRepomanQa.objects.order_by('-Id')[:Lines] + TmpDict['QA_tmp'] = BuildLogsQa.objects.order_by('-Id')[:Lines/2] + TmpDict['PR_tmp'] = PackagesRepoman.objects.order_by('-Id')[:Lines/2] return render(request, 'pages/' + pagerequest + '/repomanqa/index.html', TmpDict) |