Issue/multisite url conflict #1429

Merged
merged 3 commits into from Sep 19, 2012

Projects

None yet

2 participants

@yakky
Contributor
yakky commented Sep 18, 2012

It should be ok
We mostly tested the critical get_page_queryset_from_path, the admin methods look good too

Fix #1426

@digi604 digi604 merged commit d81f034 into divio:develop Sep 19, 2012
@digi604
Member
digi604 commented Sep 19, 2012

travis thinks there is a problem with django 1.3: http://travis-ci.org/#!/divio/django-cms/builds/2501833

@digi604 digi604 commented on the diff Sep 19, 2012
cms/utils/page_resolver.py
if not preview:
- pages = pages.published()
-
- pages = pages.filter(site=site)
+ pages = pages.published(site)
+ else:
+ pages = pages.filter(site_id=site.pk)
@digi604
digi604 Sep 19, 2012 Member

maybe replace site_id=site.pk with site=site

@digi604
Member
digi604 commented Sep 19, 2012

fixed it myself

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment