권주희

Merge branch 'develop' into 'master'

Develop



See merge request !13
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'),
......