[gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/, gpackages/templates/

[Slava Bacherikov]

commit:     7d160ccc4ee1a435e7c1db984b25f72d479a24aa
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Fri Jul  6 20:34:23 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Fri Jul  6 20:34:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=7d160ccc

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):
 
     # Autogenerated fields for fast stats
     #ebuilds_count = models.PositiveIntegerField(default = 0)
+
+    @models.permalink
+    def get_absolute_url(self):
+        return ('license', (), {'slug': self.name})
     
     def __unicode__(self):
         return self.name

diff --git a/gpackages/apps/packages/urls.py b/gpackages/apps/packages/urls.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 , EbuildsListView, \
                   PackagesListsView, PackageDetailView, EbuildDetailView, \
-                  GlobalUseListView, NewsListView, NewsDetailView
+                  GlobalUseListView, NewsListView, NewsDetailView, \
+                  LicenseDetailView
 
 urlpatterns = patterns('',
     url(r'^categories/$', CategoriesListView.as_view(), name = 'categories'),
@@ -22,4 +23,5 @@ urlpatterns = patterns('',
     url(r'^news/$', NewsListView.as_view(), name = 'news'),
     url(r'^news/(?P<pk>\d+)/$', NewsDetailView.as_view(), name = 'news_item'),
     url(r'^news/(?P<slug>[^/]+)/$', NewsDetailView.as_view(), name = 'news_item'),
+    url(r'^license/(?P<slug>[^/]+)/$', LicenseDetailView.as_view(), name = 'license'),
 )

diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/views.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, ContextTemplateView, ContextView, \
                           MultipleFilterListViewMixin
 from models import CategoryModel, HerdsModel, MaintainerModel, \
                    RepositoryModel, LicenseGroupModel, EbuildModel, \
-                   PackageModel, UseFlagModel, PortageNewsModel
+                   PackageModel, UseFlagModel, PortageNewsModel, LicenseModel
 
 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 = 'name'
     queryset = PortageNewsModel.objects.filter(lang = 'en'). \
         prefetch_related('authors', 'translators')
+
+class LicenseDetailView(ContextView, DetailView):
+    extra_context = {'page_name': 'Licens'}
+    template_name = 'license.html'
+    context_object_name = 'license'
+    slug_field = 'name'
+    queryset = LicenseModel.objects.all()
+    

diff --git a/gpackages/templates/license.html b/gpackages/templates/license.html
new file mode 100644
index 0000000..40bcf6e
--- /dev/null
+++ b/gpackages/templates/license.html
@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+{% block content %}
+<div class="license">
+    <h2>{{ license.name }}</h2>
+    <div class="license_content">
+        {{ license.text|linebreaks|urlize }}
+    </div>
+</div>
+{% endblock content %}