Skip to content

Commit

Permalink
Merge pull request #494 from MetaPhase-Consulting/chore/djangorestfra…
Browse files Browse the repository at this point in the history
…mework-3.12.3

Upgrade djangorestframework to 3.12.3
  • Loading branch information
elizabeth-jimenez authored Apr 7, 2021
2 parents c961d8d + e5599ee commit 88e6a9c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ django-jsonfield==1.4.0
django-rest-swagger==2.1.2
django-simple-history==2.0
django-sslserver==0.21
djangorestframework==3.8.2
djangorestframework==3.12.3
djangorestframework-bulk==0.2.1
djangorestframework-csv==2.1.0
djangorestframework-filters==1.0.0.dev2
Expand Down
2 changes: 1 addition & 1 deletion talentmap_api/permission/urls/group.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from talentmap_api.permission.views import group as views

router = routers.SimpleRouter()
router.register(r'', views.PermissionGroupView, base_name="permission.PermissionGroupView")
router.register(r'', views.PermissionGroupView, basename="permission.PermissionGroupView")

urlpatterns = [
url(r'^(?P<pk>[0-9]+)/user/(?P<user_id>[0-9]+)/$', views.PermissionGroupControls.as_view(), name='permissions.PermissionGroupControls-membership-actions'),
Expand Down
2 changes: 1 addition & 1 deletion talentmap_api/permission/urls/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from talentmap_api.permission.views import user as views

router = routers.SimpleRouter()
router.register(r'', views.UserPermissionView, base_name="permission.UserPermissionView")
router.register(r'', views.UserPermissionView, basename="permission.UserPermissionView")

urlpatterns = [
url(r'^all/$', views.AllUserPermissionView.as_view({**get_list}), name='permissions.AllUserPermissionsView-list'),
Expand Down

0 comments on commit 88e6a9c

Please sign in to comment.