Author: floguy
Date: Sat Sep 20 20:09:35 2008
New Revision: 13
Modified:
trunk/things/options.py
trunk/thingsproject/dev.db
trunk/thingsproject/twitter/thing.py
trunk/thingsproject/urls.py
Log:
Removed the coupling of the url prefix from the ModelThing class itself.
Modified: trunk/things/options.py
==============================================================================
--- trunk/things/options.py (original)
+++ trunk/things/options.py Sat Sep 20 20:09:35 2008
@@ -26,14 +26,10 @@
fields = {}
detail_template_name = None
list_template_name = None
- url_prefix = None
search = []
def __init__(self, qs):
self.qs = qs
- if not self.url_prefix:
- self.url_prefix = "%s/%s" % (self.qs.model._meta.app_label,
- self.qs.model._meta.module_name)
for (name, field) in self.fields.iteritems():
assert isinstance(field, BaseField) == True
field.parent = self
@@ -96,8 +92,12 @@
})
return HttpResponse(t.render(c))
- def urls(self, prefix='^', name_prefix=None):
+ def urls(self, prefix='^', name_prefix=None, url_prefix=None):
self.name_prefix = name_prefix # Is this robust enough? Needs
testing.
+ self.url_prefix = url_prefix
+ if not self.url_prefix:
+ self.url_prefix = "%s/%s" % (self.qs.model._meta.app_label,
+ self.qs.model._meta.module_name)
tmp_urls = [
url(r'%s(?P<url_prefix>%s)/$' % (prefix, self.url_prefix),
self.list_view, name='%s_list' % name_prefix),
Modified: trunk/thingsproject/dev.db
==============================================================================
Binary files. No diff available.
Modified: trunk/thingsproject/twitter/thing.py
==============================================================================
--- trunk/thingsproject/twitter/thing.py (original)
+++ trunk/thingsproject/twitter/thing.py Sat Sep 20 20:09:35 2008
@@ -7,6 +7,5 @@
field_url='date')
message = things.OrderField()
search = 'message'
- url_prefix = 'tweet'
#things.site.register(Tweet, TweetThing)
Modified: trunk/thingsproject/urls.py
==============================================================================
--- trunk/thingsproject/urls.py (original)
+++ trunk/thingsproject/urls.py Sat Sep 20 20:09:35 2008
@@ -12,4 +12,4 @@
urlpatterns = patterns('',
(r'^admin/(.*)$', admin.site.root),
-) + tt.urls()
\ No newline at end of file
+) + tt.urls(url_prefix='tweets')
\ 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
-~----------~----~----~----~------~----~------~--~---
