Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Forward porting of #1128 #2701

Merged
merged 4 commits into from Mar 1, 2014

Conversation

Projects
None yet
4 participants
Contributor

yakky commented Feb 23, 2014

Portif of #1128 by @kezabelle. Still some tests failing.
Fix #1120

Coverage Status

Coverage increased (+0.03%) when pulling 15d5f49 on yakky:feature/forwardport_1128 into ace7fe1 on divio:develop.

Member

digi604 commented Feb 24, 2014

@yakky tell me when this is not WIP anymore.

Contributor

yakky commented Feb 24, 2014

Sure. ATM it's just a blind foward porting of @kezabelle patch.
Some live tests needed.

@@ -1221,7 +1221,7 @@ def test_tree_view_queries(self):
user = self.get_superuser()
with self.login_user_context(user):
- with self.assertNumQueries(FuzzyInt(14, 25)):
+ with self.assertNumQueries(FuzzyInt(18, 33)):
@digi604

digi604 Feb 25, 2014

Member

is CMS_PERMISSIONS = True here?

@yakky

yakky Feb 27, 2014

Contributor

Yes

Contributor

yakky commented Feb 27, 2014

Looks like it's working correctly.
Following the steps in #1120, user can manage pages without the need for selecting the related site, and individual permissions are working as expected.
Rebasing underway

Contributor

yakky commented Feb 27, 2014

Rebased against current develop

Member

digi604 commented Feb 27, 2014

no more WIP?

Contributor

yakky commented Feb 27, 2014

No more WiP.
But some first-hand test still required :)
ping @johnraz

Member

digi604 commented Feb 27, 2014

man travis is slow today

Contributor

yakky commented Feb 27, 2014

👍

Contributor

yakky commented Feb 27, 2014

How about removing tests against django master?

Member

digi604 commented Feb 27, 2014

yep

Coverage Status

Coverage increased (+0.02%) when pulling e3e23c9 on yakky:feature/forwardport_1128 into 3a09d5c on divio:develop.

Contributor

johnraz commented Feb 27, 2014

I just gave it a go and it's fully working without assigning the website!
👍

Member

digi604 commented Feb 28, 2014

@yakky can you rebase?

Contributor

yakky commented Feb 28, 2014

@digi604 You're mergin too quickly for me to be in sync with rebasing! LOL 😈

Contributor

yakky commented Feb 28, 2014

I'll rebase and merge during the weekend when the dust will be settled down a bit :)

Coverage Status

Coverage increased (+0.01%) when pulling 3397382 on yakky:feature/forwardport_1128 into 32266de on divio:develop.

digi604 added a commit that referenced this pull request Mar 1, 2014

@digi604 digi604 merged commit 2b0d3b7 into divio:develop Mar 1, 2014

1 check passed

default The Travis CI build passed
Details

@yakky yakky deleted the yakky:feature/forwardport_1128 branch Nov 8, 2014

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