Skip to content

S
sun
Commit c1ac5a8e authored by 王浩's avatar 王浩
Browse files
Options

Merge branch 'haow/dev' into 'test' 

fix

See merge request !135
parents c6f4b279 2494af84
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
api/urls.py
View file @ c1ac5a8e
...@@ -39,7 +39,6 @@ urlpatterns = [ ...@@ -39,7 +39,6 @@ urlpatterns = [
url(r'^user/list/update$', UserListView.as_view()), url(r'^user/list/update$', UserListView.as_view()),
url(r'^user/get$', UserUpdateOrCreate.as_view()), url(r'^user/get$', UserUpdateOrCreate.as_view()),
url(r'^user/create$', UserUpdateOrCreate.as_view()), url(r'^user/create$', UserUpdateOrCreate.as_view()),
url(r'^user/pictorial/list$', PictorialUserList.as_view()),
url(r'^user/images/get$', UserImage.as_view()), url(r'^user/images/get$', UserImage.as_view()),
url(r'^user/images/create$', UserImage.as_view()), url(r'^user/images/create$', UserImage.as_view()),
...@@ -129,6 +128,7 @@ urlpatterns = [ ...@@ -129,6 +128,7 @@ urlpatterns = [
url(r'^pictorial/get$', PictorialUpdateOrCreate.as_view()), url(r'^pictorial/get$', PictorialUpdateOrCreate.as_view()),
url(r'^pictorial/create$', PictorialUpdateOrCreate.as_view()), url(r'^pictorial/create$', PictorialUpdateOrCreate.as_view()),
url(r'^pictorial/topics$', PictorialTopics.as_view()), url(r'^pictorial/topics$', PictorialTopics.as_view()),
url(r'^pictorial/user/list$', PictorialUserList.as_view()),
] ]
search_urlpatterns = [ search_urlpatterns = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment