savannah-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. 8


From: Sylvain Beucler
Subject: [Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. 858b5bf7a63eb5bf9d3204169bcfe97d8e339618
Date: Fri, 23 Jul 2010 21:45:39 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Savane-cleanup framework".

The branch, master has been updated
       via  858b5bf7a63eb5bf9d3204169bcfe97d8e339618 (commit)
      from  44f900b041530018c7b0b0e0626087a0965924d3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=858b5bf7a63eb5bf9d3204169bcfe97d8e339618

commit 858b5bf7a63eb5bf9d3204169bcfe97d8e339618
Author: Sylvain Beucler <address@hidden>
Date:   Fri Jul 23 23:45:33 2010 +0200

    Fix licensing pages wrt. SvGroupInfo

diff --git a/savane/svmain/models.py b/savane/svmain/models.py
index 41cac1e..66531c4 100644
--- a/savane/svmain/models.py
+++ b/savane/svmain/models.py
@@ -158,7 +158,7 @@ class License(models.Model):
         retrieved for efficiency (retrieving all informations, namely
         long_description, is quite long).  Used by the license template.
         """
-        return self.extendedgroup_set.only("name")
+        return self.svgroupinfo_set.values_list('group__name', flat=True)
 
     def __unicode__(self):
         return self.slug + ": " + self.name
@@ -493,7 +493,7 @@ class SvGroupInfo(models.Model):
                           )
 
     def __unicode__(self):
-        return self.name
+        return "%s (%s)" % (self.group.name, self.status)
 
 
 class Membership(models.Model):
diff --git a/savane/svmain/urls.py b/savane/svmain/urls.py
index c2e67ca..6ba328e 100644
--- a/savane/svmain/urls.py
+++ b/savane/svmain/urls.py
@@ -54,6 +54,7 @@ urlpatterns += patterns ('',
   url(r'^u/(?P<slug>[-\w]+)$', object_detail,
       { 'queryset' : auth_models.User.objects.all(),
         'slug_field' : 'username',
+        'extra_context' : { 'title' : 'User detail' },
         'template_name' : 'svmain/user_detail.html', },
       name='savane.svmain.user_detail'),
   url(r'^us/(?P<slug>[-\w]+)$', views.user_redir),
@@ -73,15 +74,18 @@ urlpatterns += patterns ('',
   url(r'^p/(?P<slug>[-\w]+)$', object_detail,
       { 'queryset' : auth_models.Group.objects.all(),
         'slug_field' : 'name',
+        'extra_context' : { 'title' : 'Project summary' },
         'template_name' : 'svmain/group_detail.html', },
       name='savane.svmain.group_detail'),
   url(r'^pr/(?P<slug>[-\w]+)$', views.group_redir),
   url(r'^projects/(?P<slug>[-\w]+)$', views.group_redir),
 
   url(r'^license/$', 'django.views.generic.list_detail.object_list',
-      { 'queryset' : svmain_models.License.objects.all(), },
+      { 'queryset' : svmain_models.License.objects.all(),
+        'extra_context' : { 'title' : 'License list' }, },
       name='savane.svmain.license_list'),
   url(r'^license/(?P<slug>[-\w]+)$', object_detail,
-      { 'queryset' : svmain_models.License.objects.all(), },
+      { 'queryset' : svmain_models.License.objects.all(),
+        'extra_context' : { 'title' : 'License detail' }, },
       name='savane.svmain.license_detail'),
 )
diff --git a/templates/svmain/group_detail.html 
b/templates/svmain/group_detail.html
index 9f54d69..86cc3f2 100644
--- a/templates/svmain/group_detail.html
+++ b/templates/svmain/group_detail.html
@@ -4,8 +4,8 @@
 
 <p>
 Name: {{object.name}}<br />
-License: <a 
href="{{object.license.get_absolute_url}}">{{object.license.name}}</a><br />
-Development status: {{object.devel_status}}<br />
+License: <a 
href="{{object.svgroupinfo.license.get_absolute_url}}">{{object.svgroupinfo.license.name}}</a><br
 />
+Development status: {{object.svgroupinfo.devel_status}}<br />
 </p>
 
 <p>Members:</p>
diff --git a/templates/svmain/license_detail.html 
b/templates/svmain/license_detail.html
index 1a839eb..a16d0fb 100644
--- a/templates/svmain/license_detail.html
+++ b/templates/svmain/license_detail.html
@@ -11,10 +11,10 @@ URL: <a href="{{object.license.url}}">{{object.url}}</a><br 
/>
 
 <p>Projects that use it:</p>
 
-{{ object.extendedgroup_set.count }} project(s) use this license<br />
+{{ object.svgroupinfo_set.count }} project(s) use this license<br />
 
-{% for eg in object.get_group_names %}
-<a href="{{eg.get_absolute_url}}">{{eg.name}}</a>{% if forloop.last 
%}{%else%},{% endif %}
+{% for name in object.get_group_names %}
+<a href="{% url savane.svmain.group_detail name %}">{{name}}</a>{% if 
forloop.last %}{%else%},{% endif %}
 {% endfor %}
 
 {% endblock %}

-----------------------------------------------------------------------

Summary of changes:
 savane/svmain/models.py              |    4 ++--
 savane/svmain/urls.py                |    8 ++++++--
 templates/svmain/group_detail.html   |    4 ++--
 templates/svmain/license_detail.html |    6 +++---
 4 files changed, 13 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Savane-cleanup framework



reply via email to

[Prev in Thread] Current Thread [Next in Thread]