Fix the url order, to avoid the clash between usernames and the action url. #12

Merged
merged 2 commits into from Jan 4, 2013
View
1 .gitignore
@@ -1,2 +1,3 @@
docs/_build/*
idios*.egg-info/
+*.pyc
View
11 idios/urls.py
@@ -14,14 +14,15 @@
url(r"^$", ProfileListView.as_view(), name="profile_list"),
url(r"^all/$", ProfileListView.as_view(all_profiles=True), name="profile_list_all"),
- url(r"^(?P<profile_slug>[\w\._-]+)/$", ProfileListView.as_view(), name="profile_list"),
-
- profile_detail_default,
- url(r"^(?P<profile_slug>[\w\._-]+)/profile/(?P<pk>\d+)/$", ProfileDetailView.as_view(), name="profile_detail"),
-
+
url(r"^edit/$", ProfileUpdateView.as_view(), name="profile_edit"),
url(r"^(?P<profile_slug>[\w\._-]+)/edit/$", ProfileUpdateView.as_view(), name="profile_edit"),
url(r"^create/$", ProfileCreateView.as_view(), name="profile_create"),
url(r"^(?P<profile_slug>[\w\._-]+)/create/$", ProfileCreateView.as_view(), name="profile_create"),
+
+ profile_detail_default,
+ url(r"^(?P<profile_slug>[\w\._-]+)/profile/(?P<pk>\d+)/$", ProfileDetailView.as_view(), name="profile_detail"),
+
+ url(r"^(?P<profile_slug>[\w\._-]+)/$", ProfileListView.as_view(), name="profile_list"),
)