--- a/cmpuqrct/urls.py Thu Jul 25 00:23:59 2013 +0200
+++ b/cmpuqrct/urls.py Thu Jul 25 00:49:26 2013 +0200
@@ -1,18 +1,16 @@
from django.conf.urls import patterns, include, url
+import qrurls.urls
+
from django.contrib import admin
admin.autodiscover()
-import qrurls.views
-
urlpatterns = patterns('',
- url(r'^$', qrurls.views.index, name='shorturls'),
- url(r'^urls/(?P<shorturl>\w+)', qrurls.views.shorturl, name='shorturl'),
- url(r'^(?i)u/(?P<shorturl_id>\d+)', qrurls.views.shorturl, name='miniurl'),
-
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
url(r'^admin/', include(admin.site.urls)),
# Default.
- url(r'^(?P<shorturl>\w+)$', qrurls.views.shorturl, name='maxiurl'),
+ url(r'^', include(qrurls.urls.urlpatterns)),
)
+
+
--- a/qrurls/models.py Thu Jul 25 00:23:59 2013 +0200
+++ b/qrurls/models.py Thu Jul 25 00:49:26 2013 +0200
@@ -22,18 +22,12 @@
def qrcode_url (self) :
return 'HTTP://{domain}{url}'.format(
domain = get_current_site(None).domain.upper(),
- url = self.get_maxi_url(),
+ url = self.get_absolute_url(),
)
def get_absolute_url (self) :
return reverse('shorturl', args=[self.shorturl])
- def get_short_url (self) :
- return reverse('miniurl', args=[self.id])
-
- def get_maxi_url (self) :
- return reverse('maxiurl', args=[self.shorturl])
-
def active_item(self, now=None) :
"""Currently published URLItem."""
if now is None :
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/qrurls/urls.py Thu Jul 25 00:49:26 2013 +0200
@@ -0,0 +1,8 @@
+from django.conf.urls import patterns, include, url
+import qrurls.views
+
+urlpatterns = patterns('',
+ url(r'^$', qrurls.views.index, name='shorturls'),
+ url(r'^(?P<shorturl_id>\d+)$', qrurls.views.shorturl, name='miniurl'),
+ url(r'^(?P<shorturl>\w+)$', qrurls.views.shorturl, name='shorturl'),
+)