From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SnHfF-00028e-Dh for garchives@archives.gentoo.org; Fri, 06 Jul 2012 23:10:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64F6DE0586; Fri, 6 Jul 2012 23:09:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 20562E055E for ; Fri, 6 Jul 2012 23:09:38 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 600931B40B6 for ; Fri, 6 Jul 2012 23:09:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2FE3DE5440 for ; Fri, 6 Jul 2012 23:09:34 +0000 (UTC) From: "Slava Bacherikov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slava Bacherikov" Message-ID: <1341606863.7d160ccc4ee1a435e7c1db984b25f72d479a24aa.bacher09@gentoo> Subject: [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/, gpackages/templates/ X-VCS-Repository: proj/gentoo-packages X-VCS-Files: gpackages/apps/packages/models.py gpackages/apps/packages/urls.py gpackages/apps/packages/views.py gpackages/templates/license.html X-VCS-Directories: gpackages/apps/packages/ gpackages/templates/ X-VCS-Committer: bacher09 X-VCS-Committer-Name: Slava Bacherikov X-VCS-Revision: 7d160ccc4ee1a435e7c1db984b25f72d479a24aa X-VCS-Branch: master Date: Fri, 6 Jul 2012 23:09:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f72217e3-30df-476e-a6bf-77500fa42afb X-Archives-Hash: c092ec6d7ea47d7badfd91c60b79173f commit: 7d160ccc4ee1a435e7c1db984b25f72d479a24aa Author: Slava Bacherikov bacher09 org> AuthorDate: Fri Jul 6 20:34:23 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Fri Jul 6 20:34:23 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoo-packag= es.git;a=3Dcommit;h=3D7d160ccc Add license detail view --- gpackages/apps/packages/models.py | 4 ++++ gpackages/apps/packages/urls.py | 4 +++- gpackages/apps/packages/views.py | 10 +++++++++- gpackages/templates/license.html | 9 +++++++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/= models.py index c89db88..c6d8823 100644 --- a/gpackages/apps/packages/models.py +++ b/gpackages/apps/packages/models.py @@ -499,6 +499,10 @@ class LicenseModel(StatsModel): =20 # Autogenerated fields for fast stats #ebuilds_count =3D models.PositiveIntegerField(default =3D 0) + + @models.permalink + def get_absolute_url(self): + return ('license', (), {'slug': self.name}) =20 def __unicode__(self): return self.name diff --git a/gpackages/apps/packages/urls.py b/gpackages/apps/packages/ur= ls.py index c7e6ac5..75d7b5a 100644 --- a/gpackages/apps/packages/urls.py +++ b/gpackages/apps/packages/urls.py @@ -2,7 +2,8 @@ from django.conf.urls import patterns, include, url from views import CategoriesListView, HerdsListView, MaintainersListView= , \ RepositoriesListView, LicenseGroupsView , EbuildsListV= iew, \ PackagesListsView, PackageDetailView, EbuildDetailView= , \ - GlobalUseListView, NewsListView, NewsDetailView + GlobalUseListView, NewsListView, NewsDetailView, \ + LicenseDetailView =20 urlpatterns =3D patterns('', url(r'^categories/$', CategoriesListView.as_view(), name =3D 'catego= ries'), @@ -22,4 +23,5 @@ urlpatterns =3D patterns('', url(r'^news/$', NewsListView.as_view(), name =3D 'news'), url(r'^news/(?P\d+)/$', NewsDetailView.as_view(), name =3D 'news= _item'), url(r'^news/(?P[^/]+)/$', NewsDetailView.as_view(), name =3D '= news_item'), + url(r'^license/(?P[^/]+)/$', LicenseDetailView.as_view(), name= =3D 'license'), ) diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/v= iews.py index 32a2aee..7d6322d 100644 --- a/gpackages/apps/packages/views.py +++ b/gpackages/apps/packages/views.py @@ -3,7 +3,7 @@ from generic.views import ContextListView, ContextTemplat= eView, ContextView, \ MultipleFilterListViewMixin from models import CategoryModel, HerdsModel, MaintainerModel, \ RepositoryModel, LicenseGroupModel, EbuildModel, \ - PackageModel, UseFlagModel, PortageNewsModel + PackageModel, UseFlagModel, PortageNewsModel, License= Model =20 from django.shortcuts import get_object_or_404 from package_info.parse_cp import EbuildParseCPVR, PackageParseCPR @@ -163,3 +163,11 @@ class NewsDetailView(ContextView, DetailView): slug_field =3D 'name' queryset =3D PortageNewsModel.objects.filter(lang =3D 'en'). \ prefetch_related('authors', 'translators') + +class LicenseDetailView(ContextView, DetailView): + extra_context =3D {'page_name': 'Licens'} + template_name =3D 'license.html' + context_object_name =3D 'license' + slug_field =3D 'name' + queryset =3D LicenseModel.objects.all() + =20 diff --git a/gpackages/templates/license.html b/gpackages/templates/licen= se.html new file mode 100644 index 0000000..40bcf6e --- /dev/null +++ b/gpackages/templates/license.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} +{% block content %} +
+

{{ license.name }}

+
+ {{ license.text|linebreaks|urlize }} +
+
+{% endblock content %}