Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #12 from ssouk/fixing-9

Fix the url order, to avoid the clash between usernames and the action url.
  • Loading branch information...
commit 677b3a27cc92c4c395e923bc3e81002272a80b23 2 parents d48698c + 384a02b
Patrick Altman paltman authored
Showing with 7 additions and 5 deletions.
  1. +1 −0  .gitignore
  2. +6 −5 idios/urls.py
1  .gitignore
View
@@ -1,2 +1,3 @@
docs/_build/*
idios*.egg-info/
+*.pyc
11 idios/urls.py
View
@@ -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"),
)
Please sign in to comment.
Something went wrong with that request. Please try again.