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

[Slava Bacherikov]

commit:     f6a01a82001fed88cfa5b767d40b824e9abd45b2
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Fri Jun 29 16:54:38 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Fri Jun 29 16:56:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=f6a01a82

Change urls

---
 gpackages/apps/packages/urls.py  |    3 ++-
 gpackages/apps/packages/views.py |    8 ++++++++
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/gpackages/apps/packages/urls.py b/gpackages/apps/packages/urls.py
index 3744802..ffb16ca 100644
--- a/gpackages/apps/packages/urls.py
+++ b/gpackages/apps/packages/urls.py
@@ -15,5 +15,6 @@ urlpatterns = patterns('',
     # In Future I will write my onw URL Resolver !!!
     #url(r'^package/(?:(?P<pk>\d+)|(?P<category>[^/]+)/(?P<name>[^/]+))/$', PackageDetailView.as_view(), name = 'package'),
     url(r'^package/(?P<pk>\d+)/$', PackageDetailView.as_view(), name = 'package'),
-    url(r'^package/(?P<category>[^/]+)/(?P<name>[^/:]+)(::(?P<repository>[^/]+))?/$', PackageDetailView.as_view(), name = 'package'),
+    url(r'^package/(?P<category>[^/]+)/(?P<name>[^/:]+)/$', PackageDetailView.as_view(), name = 'package'),
+    url(r'^package/(?P<category>[^/]+)/(?P<name>[^/:]+)::(?P<repository>[^/]+)/$', PackageDetailView.as_view(), name = 'package'),
 )

diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/views.py
index 3b4cd23..2ec2758 100644
--- a/gpackages/apps/packages/views.py
+++ b/gpackages/apps/packages/views.py
@@ -54,6 +54,14 @@ class PackagesListsView(ContextListView):
     extra_context = {'page_name': 'Packages', 'arches': arches}
     template_name = 'packages.html'
     context_object_name = 'packages'
+    # Faster query !!
+    #SELECT t.id, t.virtual_package_id, t.description, t.repository_id, vp.id
+    #as virtual_package__name FROM 
+    #(SELECT * FROM packages_packagemodel 
+    #ORDER BY updated_datetime DESC LIMIT 3 ) as t 
+    #INNER JOIN packages_virtualpackagemodel vp 
+    #ON( `vp`.id = t.virtual_package_id) INNER JOIN `packages_categorymodel` cp
+    #ON (vp.category_id = cp.id);
     queryset = PackageModel.objects.all(). \
         select_related('virtual_package',
                        'virtual_package__category'). \