2020-1-CloudComputing / C_Team_KhuDrive

Go to a project
Toggle navigation Toggle navigation pinning
권주희
81000df7 2 parents 86b3408a d8434801

Merge branch 'feature/item_api' into 'develop' 

Feature/item api



See merge request !12
Expand all
Inline Side-by-side
Showing 2 changed files with 3 additions and 1 deletions
This diff is collapsed. Click to expand it.
...@@ -30,6 +30,8 @@ urlpatterns = [ ...@@ -30,6 +30,8 @@ urlpatterns = [
30 path('admin/', admin.site.urls), 30 path('admin/', admin.site.urls),
31 path('', include(router.urls)), 31 path('', include(router.urls)),
32 url(r'^search/$', views.ItemViewSet.search, name='search'), 32 url(r'^search/$', views.ItemViewSet.search, name='search'),
33 + url(r'^<int:pk>/delete/$', views.ItemViewSet.delete, name='delete'),
34 + url(r'^<int:pk>/restore/$', views.ItemViewSet.restore, name='restore'),
33 url(r'^<int:pk>/share/$', views.SharedItemViewSet.share, name='share'), 35 url(r'^<int:pk>/share/$', views.SharedItemViewSet.share, name='share'),
34 url(r'^<int:pk>/move/$', views.ItemViewSet.move, name='move'), 36 url(r'^<int:pk>/move/$', views.ItemViewSet.move, name='move'),
35 url(r'^<int:pk>/copy/$', views.ItemViewSet.copy, name='copy'), 37 url(r'^<int:pk>/copy/$', views.ItemViewSet.copy, name='copy'),
...@@ -38,4 +40,4 @@ urlpatterns = [ ...@@ -38,4 +40,4 @@ urlpatterns = [
38 url(r'^login/$', views.UserViewSet.login, name='login'), 40 url(r'^login/$', views.UserViewSet.login, name='login'),
39 url(r'^upload/$', views.ItemViewSet.upload, name='upload'), 41 url(r'^upload/$', views.ItemViewSet.upload, name='upload'),
40 url(r'^status/$', views.ItemViewSet.status, name='status'), 42 url(r'^status/$', views.ItemViewSet.status, name='status'),
41 -] 43 +]
...\ No newline at end of file ...\ No newline at end of file
......