Merge branch 'develop' into 'master'

Develop See merge request !13

Merge branch 'develop' into 'master'
Develop See merge request !13
권주희
Commit 754f5d6e5356ff5caa68dfabdb5700cc5b27c403 754f5d6e 2 parents 3015d8e8 81000df7
Showing 2 changed files with 2 additions and 0 deletions
backend/api/views.py
backend/khudrive/urls.py
--- a/backend/api/views.py
View file @754f5d6
+++ b/backend/api/views.py
View file @754f5d6
--- a/backend/khudrive/urls.py
View file @754f5d6
+++ b/backend/khudrive/urls.py
View file @754f5d6
@@ -30,6 +30,8 @@ urlpatterns = [
     path('admin/', admin.site.urls),
     path('', include(router.urls)),
     url(r'^search/$', views.ItemViewSet.search, name='search'),
+     url(r'^<int:pk>/delete/$', views.ItemViewSet.delete, name='delete'),
+     url(r'^<int:pk>/restore/$', views.ItemViewSet.restore, name='restore'),
     url(r'^<int:pk>/share/$', views.SharedItemViewSet.share, name='share'),
     url(r'^<int:pk>/move/$', views.ItemViewSet.move, name='move'),
     url(r'^<int:pk>/copy/$', views.ItemViewSet.copy, name='copy'),