ConceptProd/ConceptPortal-public
1
0
Fork 0
mirror of https://github.com/IRBorisov/ConceptPortal.git synced 2025-06-26 13:00:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow dash in folder name

Browse Source
This commit is contained in:
IRBorisov 2024-06-04 11:26:20 +03:00
parent 0e174c971b
commit 395376c76f
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsconcept/backend/apps/rsform/models/LibraryItem.py
View File

@ -41,7 +41,7 @@ class LocationHead(TextChoices):
COMMON = '/S' COMMON = '/S'
_RE_LOCATION = r'^/[PLUS]((/[!\d\w]([!\d\w ]*[!\d\w])?)*)?$' # cspell:disable-line _RE_LOCATION = r'^/[PLUS]((/[!\d\w]([!\d\w\- ]*[!\d\w])?)*)?$' # cspell:disable-line
def validate_location(target: str) -> bool: def validate_location(target: str) -> bool:

6
rsconcept/backend/apps/rsform/tests/s_models/t_LibraryItem.py
View File

@ -87,13 +87,17 @@ class TestLocation(TestCase):
self.assertFalse(validate_location('/S/1/')) self.assertFalse(validate_location('/S/1/'))
self.assertFalse(validate_location('/S/1 ')) self.assertFalse(validate_location('/S/1 '))
self.assertFalse(validate_location('/S/1/2 /3')) self.assertFalse(validate_location('/S/1/2 /3'))
self.assertFalse(validate_location('/S/-'))
self.assertFalse(validate_location('/S/1-'))
self.assertTrue(validate_location('/P')) self.assertTrue(validate_location('/P'))
self.assertTrue(validate_location('/L')) self.assertTrue(validate_location('/L'))
self.assertTrue(validate_location('/U')) self.assertTrue(validate_location('/U'))
self.assertTrue(validate_location('/S')) self.assertTrue(validate_location('/S'))
self.assertTrue(validate_location('/S/1')) self.assertTrue(validate_location('/S/1'))
self.assertTrue(validate_location('/S/1-2'))
self.assertTrue(validate_location('/S/20210101 asdf-a/2'))
self.assertTrue(validate_location('/S/12')) self.assertTrue(validate_location('/S/12'))
self.assertTrue(validate_location('/S/12/3')) self.assertTrue(validate_location('/S/12/3'))
self.assertTrue(validate_location('/S/Вася пупки')) self.assertTrue(validate_location('/S/Вася шофер'))
self.assertTrue(validate_location('/S/1/!asdf/тест тест')) self.assertTrue(validate_location('/S/1/!asdf/тест тест'))

2
rsconcept/backend/apps/rsform/views/rsforms.py
View File

@ -452,7 +452,7 @@ def create_rsform(request: Request):
if 'file' not in request.FILES: if 'file' not in request.FILES:
return Response( return Response(
status=c.HTTP_400_BAD_REQUEST, status=c.HTTP_400_BAD_REQUEST,
data={f'file': msg.missingFile()} data={'file': msg.missingFile()}
) )
else: else:
data = utils.read_zipped_json(request.FILES['file'].file, utils.EXTEOR_INNER_FILENAME) data = utils.read_zipped_json(request.FILES['file'].file, utils.EXTEOR_INNER_FILENAME)

2
rsconcept/frontend/src/models/libraryAPI.ts
View File

@ -7,7 +7,7 @@ import { TextMatcher } from '@/utils/utils';
import { ILibraryItem } from './library'; import { ILibraryItem } from './library';
const LOCATION_REGEXP = /^\/[PLUS]((\/[!\d\p{L}]([!\d\p{L} ]*[!\d\p{L}])?)*)?$/u; // cspell:disable-line const LOCATION_REGEXP = /^\/[PLUS]((\/[!\d\p{L}]([!\d\p{L}\- ]*[!\d\p{L}])?)*)?$/u; // cspell:disable-line
/** /**
* Checks if a given target {@link ILibraryItem} matches the specified query. * Checks if a given target {@link ILibraryItem} matches the specified query.