Skip to content

Commit 01b2928

Browse files
authored
Change uploadedfiles API to userfiles API (#528)
* Change uploadedfiles API to userfiles API * Change uploadedfiles API to userfiles API
1 parent 9ac0908 commit 01b2928

35 files changed

+489
-554
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ After running the Integration tests the ``./CHRIS_REMOTE_FS`` directory **must**
211211
Make sure the ``chris_backend/`` dir is world writable. Then type:
212212

213213
```bash
214-
docker compose -f docker-compose_dev.yml exec chris_dev coverage run --source=feeds,plugins,uploadedfiles,users manage.py test
214+
docker compose -f docker-compose_dev.yml exec chris_dev coverage run --source=feeds,plugins,userfiles,users manage.py test
215215
docker compose -f docker-compose_dev.yml exec chris_dev coverage report
216216
```
217217

chris_backend/config/settings/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
'plugininstances',
3838
'pipelines',
3939
'pipelineinstances',
40-
'uploadedfiles',
40+
'userfiles',
4141
'pacsfiles',
4242
'servicefiles',
4343
'filebrowser',

chris_backend/config/settings/local.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
}
7575

7676
for app in ['collectionjson', 'core', 'feeds', 'plugins', 'plugininstances', 'pipelines',
77-
'pipelineinstances', 'uploadedfiles', 'pacsfiles', 'servicefiles', 'users',
77+
'pipelineinstances', 'userfiles', 'pacsfiles', 'servicefiles', 'users',
7878
'filebrowser', 'workflows']:
7979
LOGGING['loggers'][app] = {
8080
'level': 'DEBUG',

chris_backend/core/api.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from pipelines import views as pipeline_views
1111
from pipelineinstances import views as pipelineinstance_views
1212
from workflows import views as workflow_views
13-
from uploadedfiles import views as uploadedfile_views
13+
from userfiles import views as userfile_views
1414
from pacsfiles import views as pacsfile_views
1515
from servicefiles import views as servicefile_views
1616
from filebrowser import views as filebrowser_views
@@ -326,21 +326,21 @@
326326
name='workflow-plugininstance-list'),
327327

328328

329-
path('v1/uploadedfiles/',
330-
uploadedfile_views.UploadedFileList.as_view(),
331-
name='uploadedfile-list'),
329+
path('v1/userfiles/',
330+
userfile_views.UserFileList.as_view(),
331+
name='userfile-list'),
332332

333-
path('v1/uploadedfiles/search/',
334-
uploadedfile_views.UploadedFileListQuerySearch.as_view(),
335-
name='uploadedfile-list-query-search'),
333+
path('v1/userfiles/search/',
334+
userfile_views.UserFileListQuerySearch.as_view(),
335+
name='userfile-list-query-search'),
336336

337-
path('v1/uploadedfiles/<int:pk>/',
338-
uploadedfile_views.UploadedFileDetail.as_view(),
339-
name='uploadedfile-detail'),
337+
path('v1/userfiles/<int:pk>/',
338+
userfile_views.UserFileDetail.as_view(),
339+
name='userfile-detail'),
340340

341-
re_path(r'^v1/uploadedfiles/(?P<pk>[0-9]+)/.*$',
342-
uploadedfile_views.UploadedFileResource.as_view(),
343-
name='uploadedfile-resource'),
341+
re_path(r'^v1/userfiles/(?P<pk>[0-9]+)/.*$',
342+
userfile_views.UserFileResource.as_view(),
343+
name='userfile-resource'),
344344

345345

346346
path('v1/pacsfiles/',

chris_backend/feeds/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ def list(self, request, *args, **kwargs):
313313
'tags': reverse('tag-list', request=request),
314314
'pipelinesourcefiles': reverse('pipelinesourcefile-list',
315315
request=request),
316-
'uploadedfiles': reverse('uploadedfile-list', request=request),
316+
'userfiles': reverse('userfile-list', request=request),
317317
'pacsfiles': reverse('pacsfile-list', request=request),
318318
'servicefiles': reverse('servicefile-list', request=request),
319319
'filebrowser': reverse('filebrowserpath-list', request=request)}

0 commit comments

Comments
 (0)