Require user to select category before uploading #2290

ccosse · 2015-09-30T00:36:21Z

I'm not sure how/where upload.js gets included, but have here added cookie.js alongside upload.js.

2. Require user to choose category before uploading (upload.js) 3. Pass chosen category via cookie (cookie.js, upload.js) 4. Parse category_id from cookie in POST section of views.layer_upload

gamesbook · 2015-09-30T18:19:27Z

You need to be consistent and follow convention wrt to white space; for example:

category_form=CategoryForm(prefix = "category_choice_field", initial= None)

should be:

category_form = CategoryForm(prefix="category_choice_field", initial=None)

i.e. spaces around assignment to variable (= on the left) and no space when assigning to method parameters (= inside the brackets).

ccosse · 2015-09-30T19:09:19Z

@gamesbook Thanks! Fixing 2 spaces eliminated 20+ errors. Good to see and know how that can go.

Require user to select category before uploading

pjdufour · 2015-10-01T18:46:02Z

@ccosse, In the future could you squash your whitespace fix commits and then do a git force push to update to the PR branch. It's a little complicated but easy once you get the hang of it. Travis will automatically restart on a force push.

ccosse · 2015-10-01T19:08:43Z

Okay I'll figure it out. Thanks.

On Thu, Oct 1, 2015 at 2:46 PM, Patrick Dufour notifications@github.com
wrote:

In the future could you squash your whitespace fix commits and then do a
git force push to update to the PR branch. It's a little complicated but
easy once you get the hang of it. Travis will automatically restart on a
force push.

—
Reply to this email directly or view it on GitHub
#2290 (comment).

pjdufour · 2015-10-01T21:22:19Z

Thanks! Happy to assist if you have any future questions.

BerryDaniel · 2015-10-01T22:45:35Z

@jj0hns0n @ingenieroariel

I know this passed unit tests, but has anyone tested this out. I used the latest git pull and attempted to upload a tiff, selected a category and received no response.... can someone verify this also?

jj0hns0n · 2015-10-02T11:24:33Z

I gave it a brief test, but did not test with a raster. Ill do some more
testing and we can revert if things are indeed broken.

On Thu, Oct 1, 2015 at 6:45 PM, Daniel Berry notifications@github.com
wrote:

@jj0hns0n https://github.com/jj0hns0n @ingenieroariel
https://github.com/ingenieroariel

I know this passed unit tests, but has anyone tested this out. I used the
latest git pull and attempted to upload a tiff, selected a category and
received no response.... can someone verify this also?

—
Reply to this email directly or view it on GitHub
#2290 (comment).

ccosse · 2015-10-02T12:27:42Z

Hi, what's the best way to put something out there for review before
merging? (i.e. this PR). Should I just request to be reviewed discussed
via message attached to the PR itself, or is there another way? I tested
.tif and .zip uploads from Linux only using Firefox. While I'm not aware
of anything "broken", I still plan to improve upon this current
implementation. Is this the way to go about it, i.e. submit a PR and
discuss it from there? That was my intention.

Specific future improvements are:

Use Django's cookie protocol vs. custom one I introduced
Eliminate use of cookie-passing in favor of CategoryForm
More elegant parsing of category-cookie in views.py

That said, it works fine for me so if it's not broken then I'd also like to
see it remain merged, but not closed. Is that possible?
Thanks!
-Charles

On Fri, Oct 2, 2015 at 7:24 AM, Jeffrey Johnson notifications@github.com
wrote:

I gave it a brief test, but did not test with a raster. Ill do some more
testing and we can revert if things are indeed broken.

On Thu, Oct 1, 2015 at 6:45 PM, Daniel Berry notifications@github.com
wrote:

@jj0hns0n https://github.com/jj0hns0n @ingenieroariel
https://github.com/ingenieroariel

I know this passed unit tests, but has anyone tested this out. I used the
latest git pull and attempted to upload a tiff, selected a category and
received no response.... can someone verify this also?

—
Reply to this email directly or view it on GitHub
#2290 (comment).

—
Reply to this email directly or view it on GitHub
#2290 (comment).

ccosse · 2015-10-02T16:14:26Z

Yes, I just did a complete/fresh re-install and indeed Cookie.js was not
loaded. In my own defense, that was the one thing I did mention in the
initial PR message ...

It's a simple fix but still not sure where cookie.js gets loaded
(introduced alongside ../static/geonode/js/upload/upload.js)

On Fri, Oct 2, 2015 at 8:27 AM, Charles Cossé ccosse@gmail.com wrote:

Hi, what's the best way to put something out there for review before
merging? (i.e. this PR). Should I just request to be reviewed discussed
via message attached to the PR itself, or is there another way? I tested
.tif and .zip uploads from Linux only using Firefox. While I'm not aware
of anything "broken", I still plan to improve upon this current
implementation. Is this the way to go about it, i.e. submit a PR and
discuss it from there? That was my intention.

Specific future improvements are:

Use Django's cookie protocol vs. custom one I introduced

Eliminate use of cookie-passing in favor of CategoryForm

More elegant parsing of category-cookie in views.py

That said, it works fine for me so if it's not broken then I'd also like
to see it remain merged, but not closed. Is that possible?
Thanks!
-Charles

On Fri, Oct 2, 2015 at 7:24 AM, Jeffrey Johnson notifications@github.com
wrote:

I gave it a brief test, but did not test with a raster. Ill do some more
testing and we can revert if things are indeed broken.

On Thu, Oct 1, 2015 at 6:45 PM, Daniel Berry notifications@github.com
wrote:

@jj0hns0n https://github.com/jj0hns0n @ingenieroariel
https://github.com/ingenieroariel

I know this passed unit tests, but has anyone tested this out. I used
the
latest git pull and attempted to upload a tiff, selected a category and
received no response.... can someone verify this also?

—
Reply to this email directly or view it on GitHub
#2290 (comment).

—
Reply to this email directly or view it on GitHub
#2290 (comment).

jj0hns0n · 2015-10-02T16:18:22Z

Can you post to the dev list to ask for help. I dont have time to look at
this today after all.

On Fri, Oct 2, 2015 at 12:14 PM, Charles B. Cossé notifications@github.com
wrote:

Yes, I just did a complete/fresh re-install and indeed Cookie.js was not
loaded. In my own defense, that was the one thing I did mention in the
initial PR message ...

It's a simple fix but still not sure where cookie.js gets loaded
(introduced alongside ../static/geonode/js/upload/upload.js)

On Fri, Oct 2, 2015 at 8:27 AM, Charles Cossé ccosse@gmail.com wrote:

Hi, what's the best way to put something out there for review before
merging? (i.e. this PR). Should I just request to be reviewed discussed
via message attached to the PR itself, or is there another way? I tested
.tif and .zip uploads from Linux only using Firefox. While I'm not aware
of anything "broken", I still plan to improve upon this current
implementation. Is this the way to go about it, i.e. submit a PR and
discuss it from there? That was my intention.

Specific future improvements are:

Use Django's cookie protocol vs. custom one I introduced

Eliminate use of cookie-passing in favor of CategoryForm

More elegant parsing of category-cookie in views.py

That said, it works fine for me so if it's not broken then I'd also like
to see it remain merged, but not closed. Is that possible?
Thanks!
-Charles

On Fri, Oct 2, 2015 at 7:24 AM, Jeffrey Johnson <
notifications@github.com>
wrote:

I gave it a brief test, but did not test with a raster. Ill do some more
testing and we can revert if things are indeed broken.

On Thu, Oct 1, 2015 at 6:45 PM, Daniel Berry notifications@github.com
wrote:

@jj0hns0n https://github.com/jj0hns0n @ingenieroariel
https://github.com/ingenieroariel

I know this passed unit tests, but has anyone tested this out. I used
the
latest git pull and attempted to upload a tiff, selected a category
and
received no response.... can someone verify this also?

—
Reply to this email directly or view it on GitHub
<#2290 (comment)
.

—
Reply to this email directly or view it on GitHub
#2290 (comment).

—
Reply to this email directly or view it on GitHub
#2290 (comment).

simod · 2015-10-06T10:19:24Z

@ccosse adding here the comment, the layer upload is broken due to key error 'category' we should fix it asap.
Thanks!

ccosse · 2015-10-06T10:23:31Z

Simone, I apologize then ... I will look at it first thing when I get to
work in 1 hour. There was PR #2295 which (I thought) fixed #2290 ... but
this doesn't sound like the same thing. Anyway I will definitely fix this
morning. -Charles

On Tue, Oct 6, 2015 at 6:19 AM, Simone Dalmasso notifications@github.com
wrote:

@ccosse https://github.com/ccosse adding here the comment, the layer
upload is broken due to key error 'category' we should fix it asap.
Thanks!

—
Reply to this email directly or view it on GitHub
#2290 (comment).

ccosse · 2015-10-06T11:12:42Z

Simone, can you tell me any more info? I just tested on Firefox and Chrome
and it works fine. Not to say that there is no problem, just that I don't
currently have any errors. Was that a django error from layers/views.py
or in javascript console? I'm still on my way to check it out, just
seeking a little more info. Thanks.

On Tue, Oct 6, 2015 at 6:19 AM, Simone Dalmasso notifications@github.com
wrote:

@ccosse https://github.com/ccosse adding here the comment, the layer
upload is broken due to key error 'category' we should fix it asap.
Thanks!

—
Reply to this email directly or view it on GitHub
#2290 (comment).

simod · 2015-10-06T11:15:42Z

Thanks for taking a look,
on layer upload I pick a category and submit, looking at the http request
to layers/upload the "category" for doesn't seem to be submitted.

Traceback (most recent call last):

File "/opt/master-geonode/geonode/layers/views.py", line 155, in
layer_upload

topic_id = form.cleaned_data["category"]

KeyError: 'category'

2015-10-06 13:12 GMT+02:00 Charles B. Cossé notifications@github.com:

Simone, can you tell me any more info? I just tested on Firefox and Chrome
and it works fine. Not to say that there is no problem, just that I don't
currently have any errors. Was that a django error from layers/views.py
or in javascript console? I'm still on my way to check it out, just
seeking a little more info. Thanks.

On Tue, Oct 6, 2015 at 6:19 AM, Simone Dalmasso notifications@github.com
wrote:

@ccosse https://github.com/ccosse adding here the comment, the layer
upload is broken due to key error 'category' we should fix it asap.
Thanks!

—
Reply to this email directly or view it on GitHub
#2290 (comment).

—
Reply to this email directly or view it on GitHub
#2290 (comment).

Simone

ccosse · 2015-10-06T11:56:33Z

Should be fixed. I forgot that there had been changes to layers/views.py
at the time of PR #2295.

On Tue, Oct 6, 2015 at 7:15 AM, Simone Dalmasso notifications@github.com
wrote:

to layers/upload the "category" for doesn't seem to be submitted.

It is true that the category form is not being submitted ... I resorted to
passing the selected category via cookie (cookie.js and upload.js) until I
can figure out how to add the category form to the file-upload's formset.
I spent a lot of time on that part but without success (yet). I plan to
revisit that soon and any suggestion about how to get the category form
included in the formset would be great. Otherwise I'll still figure it out
with time.

Traceback (most recent call last):

File "/opt/master-geonode/geonode/layers/views.py", line 155, in
layer_upload

topic_id = form.cleaned_data["category"]

KeyError: 'category'

2015-10-06 13:12 GMT+02:00 Charles B. Cossé notifications@github.com:

Simone, can you tell me any more info? I just tested on Firefox and
Chrome
and it works fine. Not to say that there is no problem, just that I don't
currently have any errors. Was that a django error from layers/views.py
or in javascript console? I'm still on my way to check it out, just
seeking a little more info. Thanks.

On Tue, Oct 6, 2015 at 6:19 AM, Simone Dalmasso <
notifications@github.com>
wrote:

@ccosse https://github.com/ccosse adding here the comment, the layer
upload is broken due to key error 'category' we should fix it asap.
Thanks!

—
Reply to this email directly or view it on GitHub
#2290 (comment).

—
Reply to this email directly or view it on GitHub
#2290 (comment).

Simone

—
Reply to this email directly or view it on GitHub
#2290 (comment).

simod · 2015-10-06T12:05:27Z

ok, are you going to open a PR?

2015-10-06 13:56 GMT+02:00 Charles B. Cossé notifications@github.com:

Should be fixed. I forgot that there had been changes to layers/views.py
at the time of PR #2295.

On Tue, Oct 6, 2015 at 7:15 AM, Simone Dalmasso notifications@github.com
wrote:

to layers/upload the "category" for doesn't seem to be submitted.

It is true that the category form is not being submitted ... I resorted to
passing the selected category via cookie (cookie.js and upload.js) until I
can figure out how to add the category form to the file-upload's formset.
I spent a lot of time on that part but without success (yet). I plan to
revisit that soon and any suggestion about how to get the category form
included in the formset would be great. Otherwise I'll still figure it out
with time.

Traceback (most recent call last):

File "/opt/master-geonode/geonode/layers/views.py", line 155, in
layer_upload

topic_id = form.cleaned_data["category"]

KeyError: 'category'

2015-10-06 13:12 GMT+02:00 Charles B. Cossé notifications@github.com:

Simone, can you tell me any more info? I just tested on Firefox and
Chrome
and it works fine. Not to say that there is no problem, just that I
don't
currently have any errors. Was that a django error from layers/views.py
or in javascript console? I'm still on my way to check it out, just
seeking a little more info. Thanks.

On Tue, Oct 6, 2015 at 6:19 AM, Simone Dalmasso <
notifications@github.com>
wrote:

@ccosse https://github.com/ccosse adding here the comment, the
layer
upload is broken due to key error 'category' we should fix it asap.
Thanks!

—
Reply to this email directly or view it on GitHub
<#2290 (comment)
.

—
Reply to this email directly or view it on GitHub
#2290 (comment).

Simone

—
Reply to this email directly or view it on GitHub
#2290 (comment).

—
Reply to this email directly or view it on GitHub
#2290 (comment).

Simone

simod · 2015-10-22T09:34:52Z

This clashes with the multiple layer upload as they may have different categories, any chance we find a solution? Otherwise we'll have to revert.

ccosse · 2015-10-22T10:39:58Z

Oh boy. Okay I can try to fix it later today. I'll let you know.

On Thu, Oct 22, 2015 at 5:34 AM, Simone Dalmasso notifications@github.com
wrote:

This clashes with the multiple layer upload as they may have different
categories, any chance we find a solution? Otherwise we'll have to revert.

—
Reply to this email directly or view it on GitHub
#2290 (comment).

ccosse added 8 commits September 29, 2015 20:12

1. Pass category_form from views.layer_upload to layer_upload.html

994e60d

2. Require user to choose category before uploading (upload.js) 3. Pass chosen category via cookie (cookie.js, upload.js) 4. Parse category_id from cookie in POST section of views.layer_upload

1. Pass category_form from views.layer_upload to layer_upload.html

b881958

2. Require user to choose category before uploading (upload.js) 3. Pass chosen category via cookie (cookie.js, upload.js) 4. Parse category_id from cookie in POST section of views.layer_upload

Chage "//" to "#" for .py comment

cc38440

Coding style fixes based on Travis CL output

71bf5d2

Whitespace fixes as per Travis Cl output:

7e19e17

More whitespace nonsense

8d6fb56

Whitespace hell

d11feb7

Whitespace hell 4real

ae591f4

Consistent use of whitespaces

643d64b

jj0hns0n added a commit that referenced this pull request Oct 1, 2015

Merge pull request #2290 from ccosse/master

e35884b

Require user to select category before uploading

jj0hns0n merged commit e35884b into GeoNode:master Oct 1, 2015

ccosse mentioned this pull request Oct 3, 2015

Added explicit import of cookie.js #2295

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Require user to select category before uploading #2290

Require user to select category before uploading #2290

ccosse commented Sep 30, 2015

gamesbook commented Sep 30, 2015

ccosse commented Sep 30, 2015

pjdufour commented Oct 1, 2015

ccosse commented Oct 1, 2015

pjdufour commented Oct 1, 2015

BerryDaniel commented Oct 1, 2015

jj0hns0n commented Oct 2, 2015

ccosse commented Oct 2, 2015

ccosse commented Oct 2, 2015

jj0hns0n commented Oct 2, 2015

simod commented Oct 6, 2015

ccosse commented Oct 6, 2015

ccosse commented Oct 6, 2015

simod commented Oct 6, 2015

ccosse commented Oct 6, 2015

simod commented Oct 6, 2015

simod commented Oct 22, 2015

ccosse commented Oct 22, 2015

Require user to select category before uploading #2290

Require user to select category before uploading #2290

Conversation

ccosse commented Sep 30, 2015

gamesbook commented Sep 30, 2015

ccosse commented Sep 30, 2015

pjdufour commented Oct 1, 2015

ccosse commented Oct 1, 2015

pjdufour commented Oct 1, 2015

BerryDaniel commented Oct 1, 2015

jj0hns0n commented Oct 2, 2015

ccosse commented Oct 2, 2015

ccosse commented Oct 2, 2015

jj0hns0n commented Oct 2, 2015

simod commented Oct 6, 2015

ccosse commented Oct 6, 2015

ccosse commented Oct 6, 2015

simod commented Oct 6, 2015

ccosse commented Oct 6, 2015

simod commented Oct 6, 2015

simod commented Oct 22, 2015

ccosse commented Oct 22, 2015