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

Jump to bottom

upload bug and companion file names #64

Closed
wants to merge 1 commit into from
Closed

upload bug and companion file names #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions src/GeoNodePy/geonode/maps/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import json
import os
import tempfile
import pdb


class JSONField(forms.CharField):
def clean(self, text):
Expand Down Expand Up @@ -32,10 +34,10 @@ def clean(self):
raise forms.ValidationError("When uploading Shapefiles, .SHX and .DBF files are also required.")
dbf_name, __ = os.path.splitext(dbf_file.name)
shx_name, __ = os.path.splitext(shx_file.name)
if dbf_name != base_name or shx_name != base_name:
raise forms.ValidationError("It looks like you're uploading "
"components from different Shapefiles. Please "
"double-check your file selections.")
if dbf_name != base_name:
dbf_file.name = base_name + ".dbf"
if shx_name != base_name:
shx_file.name = base_name + ".shx"
if cleaned["prj_file"] is not None:
prj_file = cleaned["prj_file"].name
if os.path.splitext(prj_file)[0] != base_name:
Expand Down