Skip to content

Fixing trailing slash (rebased onto develop)#4124

Closed
atarkowska wants to merge 1 commit intoome:developfrom
atarkowska:rebased/develop/trailing_slash
Closed

Fixing trailing slash (rebased onto develop)#4124
atarkowska wants to merge 1 commit intoome:developfrom
atarkowska:rebased/develop/trailing_slash

Conversation

@atarkowska
Copy link
Copy Markdown
Member

This is the same as gh-4123 but rebased onto develop.


This fixes issue with Move to group dialog box. URLs were missing trailing slash and redirected. Redirection was blocked loading mixed active content.

GET https://trout.o.org/integration/webclient/fileset_check/chgrp?Project=191 301 MOVED PERMANENTLY
GET https://trout.o.org/integration/webclient/load_chgrp_groups?Project=191 301 MOVED PERMANENTLY
Blocked loading mixed active content "http://trout.o.org/integration/webclient/fileset_check/chgrp/?Project=..."
Blocked loading mixed active content "http://trout.o.org/integration/webclient/load_chgrp_groups/?Project=..."

URL:

url(r'^load_chgrp_groups/$',
        views.load_chgrp_groups,
        name="load_chgrp_groups"),  # Query E.g. ?Image=1,2&Dataset=3

They must be consistent. By default https://docs.djangoproject.com/en/1.6/ref/settings/#append-slash in True.

@will-moore if you want to use both you have to add:

(r'^load_chgrp_groups$', redirect_to, {'url': ...}),

cc: @sbesson @will-moore

@atarkowska atarkowska mentioned this pull request Sep 3, 2015
@atarkowska
Copy link
Copy Markdown
Member Author

--rebased-from #4123

@will-moore will-moore mentioned this pull request Sep 3, 2015
@will-moore
Copy link
Copy Markdown
Member

Since this conflicts with jstree_2015 branch #3995 I've simply cherry-picked it there: will-moore@f7dbb45
and added a comment to the description.
So you can close this and add #no-rebase to #4123.

@joshmoore
Copy link
Copy Markdown
Member

Done.

@joshmoore joshmoore closed this Sep 3, 2015
@atarkowska atarkowska deleted the rebased/develop/trailing_slash branch September 3, 2015 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants