ConceptProd/Portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

B: Fix renaming folders in user location
Some checks failed
Backend CI / build (3.12) (push) Has been cancelled
Details
Frontend CI / build (22.x) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Ivan 2024-08-22 10:45:24 +03:00
parent 4c68462039
commit 07c2f1da2f
2 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
rsconcept/backend/apps/library/tests/s_views/t_library.py
View File

@ -183,39 +183,58 @@ class TestLibraryViewset(EndpointTester):
@decl_endpoint('/api/library/rename-location', method='patch')
def test_rename_location(self):
self.owned.location = '/U/temp'
self.owned.location = '/S/temp'
self.owned.save()
self.unowned.location = '/U/temp'
self.unowned.location = '/S/temp'
self.unowned.save()
owned2 = LibraryItem.objects.create(
title='Test3',
alias='T3',
owner=self.user,
location='/U/temp/123'
location='/S/temp/123'
)
data = {
'target': '/S/temp',
'new_location': '/S/temp2'
}
self.executeBadData(data={})
self.executeBadData(data={'target:': '/S/temp'})
self.executeBadData(data={'new_location:': '/S/temp'})
self.executeBadData(data={'target:': 'invalid', 'new_location': '/S/temp'})
self.executeBadData(data={'target:': '/S/temp', 'new_location': 'invalid'})
self.executeOK(data=data)
self.owned.refresh_from_db()
self.unowned.refresh_from_db()
owned2.refresh_from_db()
self.assertEqual(self.owned.location, '/S/temp2')
self.assertEqual(self.unowned.location, '/S/temp')
self.assertEqual(owned2.location, '/S/temp2/123')
self.toggle_admin(True)
self.executeOK(data=data)
self.unowned.refresh_from_db()
self.assertEqual(self.unowned.location, '/S/temp2')
@decl_endpoint('/api/library/rename-location', method='patch')
def test_rename_location_user(self):
self.owned.location = '/U/temp'
self.owned.save()
self.unowned.location = '/U/temp'
self.unowned.save()
data = {
'target': '/U/temp',
'new_location': '/U/temp2'
}
self.executeBadData(data={})
self.executeBadData(data={'target:': '/U/temp'})
self.executeBadData(data={'new_location:': '/U/temp'})
self.executeBadData(data={'target:': 'invalid', 'new_location': '/U/temp'})
self.executeBadData(data={'target:': '/U/temp', 'new_location': 'invalid'})
self.toggle_admin(True)
self.executeOK(data=data)
self.owned.refresh_from_db()
self.unowned.refresh_from_db()
owned2.refresh_from_db()
self.assertEqual(self.owned.location, '/U/temp2')
self.assertEqual(self.unowned.location, '/U/temp')
self.assertEqual(owned2.location, '/U/temp2/123')
self.toggle_admin(True)
self.executeOK(data=data)
self.unowned.refresh_from_db()
self.assertEqual(self.unowned.location, '/U/temp2')
@decl_endpoint('/api/library/{item}/set-editors', method='patch')
def test_set_editors(self):

4
rsconcept/backend/apps/library/views/library.py
View File

@ -115,13 +115,15 @@ class LibraryViewSet(viewsets.ModelViewSet):
if new_location.startswith(m.LocationHead.LIBRARY) and not self.request.user.is_staff:
return Response(status=c.HTTP_403_FORBIDDEN)
user_involved = new_location.startswith(m.LocationHead.USER) or target.startswith(m.LocationHead.USER)
with transaction.atomic():
changed: list[m.LibraryItem] = []
items = m.LibraryItem.objects \
.filter(Q(location=target) | Q(location__startswith=f'{target}/')) \
.only('location', 'owner_id')
for item in items:
if item.owner_id == self.request.user.pk or self.request.user.is_staff:
if item.owner_id == self.request.user.pk or (self.request.user.is_staff and not user_involved):
item.location = item.location.replace(target, new_location)
changed.append(item)
if changed: