Fakultas Ilmu Komputer UI

Commit b8562ab0 authored by Rayhan Muzakki's avatar Rayhan Muzakki 💬
Browse files

Merge branch 'staging' into 'pbi9'

# Conflicts:
#   api/tests.py
#   api/views.py
parents 09dbe011 dd7c76d6
......@@ -52,6 +52,9 @@ urlpatterns = [
urls.path('users/', api_views.UserList.as_view(), name='user-list'),
urls.path('users/sorttransaction', api_views.UserListTransaction.as_view(), name='user-list-sorttransaction'),
urls.path('users/sortcash', api_views.UserListCash.as_view(), name='user-list-sortcash'),
urls.path('users/sortgoods', api_views.UserListGoods.as_view(), name='user-list-sortgoods'),
urls.path('users/<str:pk>/', api_views.UserDetail.as_view(), name='user-detail'),
Supports Markdown
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