Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move file upload and deletion to content from files #928

Merged
merged 2 commits into from
Nov 11, 2024
+3 −3
Merged

Move file upload and deletion to content from files #928

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
540ac9a
Move file upload and deletion to content from files
Tmpecho Nov 11, 2024
b97fe2d
Merge branch 'dev' into refactor/move-file-upload-view
MadsNyl Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/content/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
register_with_feide,
send_email,
)
from app.files.views.upload import delete, upload

router = routers.DefaultRouter()

Expand Down Expand Up @@ -51,6 +52,8 @@
urlpatterns = [
re_path(r"", include(router.urls)),
path("accept-form/", accept_form),
path("upload/", upload),
path("delete-file/<str:container_name>/<str:blob_name>/", delete),
path("send-email/", send_email),
path("feide/", register_with_feide),
re_path(r"users/(?P<user_id>[^/.]+)/events.ics", UserCalendarEvents()),
Expand Down
3 changes: 0 additions & 3 deletions app/files/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from rest_framework import routers

from app.files.views.file import FileViewSet
from app.files.views.upload import delete, upload
from app.files.views.user_gallery import UserGalleryViewSet

router = routers.DefaultRouter()
Expand All @@ -11,7 +10,5 @@
router.register("user_gallery", UserGalleryViewSet, basename="user_gallery")

urlpatterns = [
path("upload/", upload),
path("delete-file/<str:container_name>/<str:blob_name>/", delete),
path("files/", include(router.urls)),
]
Loading