Author: floguy
Date: Sun Sep 21 03:33:03 2008
New Revision: 921
Modified:
trunk/local_apps/projects/thing.py
trunk/local_apps/tribes/thing.py
Log:
Use the new OrderCountField() by django-things.
Modified: trunk/local_apps/projects/thing.py
==============================================================================
--- trunk/local_apps/projects/thing.py (original)
+++ trunk/local_apps/projects/thing.py Sun Sep 21 03:33:03 2008
@@ -6,23 +6,20 @@
verbose_name_desc='Newest', url_asc='oldest', url_desc='newest',
field_url='date')
name = things.OrderField()
- member_count = things.OrderField(verbose_name_asc='Smallest',
- verbose_name_desc='Largest', url_asc='smallest',
url_desc='largest',
- field_url='size')
+ member_users = things.OrderCountField(
+ verbose_name_asc='Least Members',
+ verbose_name_desc='Most Members',
+ url_asc='last-members',
+ url_desc='most-members',
+ field_url='members'
+ )
+ topics = things.OrderCountField(
+ verbose_name_asc='Least Topics',
+ verbose_name_desc='Most Topics',
+ url_asc='last-topics',
+ url_desc='most-topics',
+ field_url='topics'
+ )
search = ('name', 'description')
template_dir = 'projects'
- list_template_name = 'projects.html'
-
- def get_query_set(self, m2m_name='member_users'):
- m2m_field = self.model._meta.get_field(m2m_name)
- qn = connection.ops.quote_name
- SQL = """
- SELECT COUNT(*)
- FROM %(m2m_table)s
- WHERE %(m2m_table)s.%(column_name)s = %(self_table)s.id
- """ % {
- 'm2m_table': qn(m2m_field.m2m_db_table()),
- 'column_name': qn(m2m_field.m2m_column_name()),
- 'self_table': qn(self.model._meta.db_table),
- }
- return self.model._default_manager.extra(select={'member_count':
SQL})
\ No newline at end of file
+ list_template_name = 'projects.html'
\ No newline at end of file
Modified: trunk/local_apps/tribes/thing.py
==============================================================================
--- trunk/local_apps/tribes/thing.py (original)
+++ trunk/local_apps/tribes/thing.py Sun Sep 21 03:33:03 2008
@@ -6,23 +6,20 @@
verbose_name_desc='Newest', url_asc='oldest', url_desc='newest',
field_url='date')
name = things.OrderField()
- member_count = things.OrderField(verbose_name_asc='Smallest',
- verbose_name_desc='Largest', url_asc='smallest',
url_desc='largest',
- field_url='size')
+ members = things.OrderCountField(
+ verbose_name_asc='Least Members',
+ verbose_name_desc='Most Members',
+ url_asc='last-members',
+ url_desc='most-members',
+ field_url='members'
+ )
+ topics = things.OrderCountField(
+ verbose_name_asc='Least Topics',
+ verbose_name_desc='Most Topics',
+ url_asc='last-topics',
+ url_desc='most-topics',
+ field_url='topics'
+ )
search = ('name', 'description')
template_dir = 'tribes'
- list_template_name = 'tribes.html'
-
- def get_query_set(self, m2m_name='members'):
- m2m_field = self.model._meta.get_field(m2m_name)
- qn = connection.ops.quote_name
- SQL = """
- SELECT COUNT(*)
- FROM %(m2m_table)s
- WHERE %(m2m_table)s.%(column_name)s = %(self_table)s.id
- """ % {
- 'm2m_table': qn(m2m_field.m2m_db_table()),
- 'column_name': qn(m2m_field.m2m_column_name()),
- 'self_table': qn(self.model._meta.db_table),
- }
- return self.model._default_manager.extra(select={'member_count':
SQL})
\ No newline at end of file
+ list_template_name = 'tribes.html'
\ No newline at end of file
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---