autonomic-cooperative/ojuso-map
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update draft deletion logic for new field

Browse Source 
And comment the delete-files-only-in-drafts logic.
This commit is contained in:
Anna Sidwell 2018-06-27 19:50:24 +01:00 committed by Naomi
parent a900a146e2
commit f5fac0b6a0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/map/views.py
View File

@ -161,9 +161,11 @@ class Drafts(LoginRequiredMixin, View):
data = json.loads(draft.data) data = json.loads(draft.data)
for k in ['official_project_documents', 'other_documents', for k in ['official_project_documents', 'other_documents',
'shapefiles']: 'shapefiles', 'images' ]:
try: try:
# Filter the dictionary of form fields in the draft
# down to just the ones right the right name `k`
items = list(filter( items = list(filter(
lambda x: ( lambda x: (
x['name'] == '{0}_files'.format(k) x['name'] == '{0}_files'.format(k)
@ -172,12 +174,14 @@ class Drafts(LoginRequiredMixin, View):
)) ))
except KeyError: except KeyError:
continue continue
# Split the comma-separated list of IDs into a list
try: try:
items = items[0]['value'].split(',') items = items[0]['value'].split(',')
except IndexError: except IndexError:
continue continue
# Delete those items
for item in items: for item in items:
try: try:
f = File.objects.get(id=item) f = File.objects.get(id=item)