Fix: Bad Title.path in Multilanguage sites if parent slug is created or modified #6968

fp4code · 2021-01-22T15:16:48Z

Description

Fix #6622 Bad Title.path in Multilanguage sites if parent slug is created or modified
Just a reopening of PR #6965

Related resources

First bug:

In 'en','fr' site

Create /en/en-1/ page
Create from this page a subpage with slug "en-1-1"
Create "fr" translation with slug "fr-1-1"
Create "fr" translation of parent /en/en-1/ with slug "fr-1"

As a result, the path of subpage "fr-1-1" is not updated. Here the paths:

/en/en-1/
/en/en-1/en-1-1/
/fr/fr-1/
/fr/en-1/fr-1-1/ <-- Bad Title.path "en-1/fr-1-1" instead of "fr-1/fr-1-1"
Second bug:

Change "en" slug of /en/en-1/ page to "en-1b",
As a result the path of subpage "en-1-1" is changed to "fr-1/en-1-1" instead of "en-1b/en-1-1". Here the paths:

/en/en-1b/
/en/fr-1/en-1-1/ <-- Bad Title.path "fr-1/en-1-1" instead of "en-1b/fr-1-1"
/fr/fr-1/
/fr/en-1/fr-1-1/ <-- Bad Title.path "en-1/fr-1-1" instead of "fr-1/fr-1-1"

Checklist

I have opened this pull request against develop
I have updated the CHANGELOG.rst
I have added or modified the tests when changing logic

…ted or modified

…fix6622

Aiky30 · 2021-01-26T08:51:25Z

@fp4code I think that this PR has all of the changes in it so the following PR can be closed: #6967

If you agree with the above then this PR (6968) becomes the one with all of the changes ready to review.

Once you confirm that is correct I can start to review this PR.

fp4code · 2021-01-26T09:08:09Z

@Aiky30 yes, please start to review this PR. I have just added in Related resources the two bug descriptions. These bugs are also tested now in cms/tests/test_titlepath.py file.

Aiky30

Thanks for your effort on this issue.

I hope that you agree with the feedback and if you need any help please reach out and we can discuss any of your concerns in depth.

CHANGELOG.rst

cms/tests/test_titlepath.py

Aiky30 · 2021-01-26T11:14:04Z

cms/tests/test_titlepath.py

+
+class TitlePathTestCase(CMSTestCase):
+
+    def test0001_translated_subpage_title_path(self):


Pleae name the tests consistently with the other tests in the project. Maybe: "test_translated_subpage_slug_generation_for_pages_with_different_language_translations"

New name is:
"test_translated_subpage_title_path_regeneration"

cms/tests/test_titlepath.py

Aiky30 · 2021-01-26T11:21:32Z

@victor-yunenko This will need your review as this is directly related to an issue that you have raised. :-)

fp4code · 2021-01-27T08:42:32Z

I would like to write tests similar to "test_translated_subpage_title_path_regeneration" and "test_subpage_title_path_regeneration_after_parent_slug_change", but at form level. Precisely to exercise cms.forms.ChangePageForm.save. Any advice ?

Aiky30

My apologies for what may look like a lot of minor changes. I have only added them because the PEP 008 validation will fail due to 2 lines between the test functions. We may as well do a little more clean up at the same time.

You can accept or reject each suggestion using Github and will require no "manual" code changes. This should be a very easy task in the Github user interface. :-)

cms/tests/test_page.py

Required by PEP008 validation Co-authored-by: Aiky30 <Aiky30@users.noreply.github.com>

Remove empty line break Co-authored-by: Aiky30 <Aiky30@users.noreply.github.com>

Comment enhancement Co-authored-by: Aiky30 <Aiky30@users.noreply.github.com>

Remove empty line as required by PEP 008 Co-authored-by: Aiky30 <Aiky30@users.noreply.github.com>

Remove an empty line Co-authored-by: Aiky30 <Aiky30@users.noreply.github.com>

fp4code · 2021-01-27T16:30:49Z

Thanks @Aiky30 for code polishing. It is simple to accept your suggestions. Maybe I should have used the "batch..." button. Unfortunately this button is not clear for me. I hope there will be a rebase before merging.

Aiky30 · 2021-01-27T18:41:33Z

Thanks @Aiky30 for code polishing. It is simple to accept your suggestions. Maybe I should have used the "batch..." button. Unfortunately this button is not clear for me. I hope there will be a rebase before merging.

Glad that it made it easy. We are obviously super grateful for your contribution and want to make it as easy as possible by also improving the codebase with tests. :-)

We just need a final sign off from @victor-yunenko and then we can look to merge it and then maybe backport it into a version if this is blocking people.

Aiky30 · 2021-01-27T18:44:43Z

@fp4code to bring the branch back up to date are yiu able to pull upstream master onto you branch?

You may have to set upstream for that to work.

fp4code · 2021-01-27T21:20:07Z

@fp4code to bring the branch back up to date are yiu able to pull upstream master onto you branch?

You may have to set upstream for that to work.

Hi @Aiky30, I can do what you want but I'm not sure to understand exactly what is required. For example, I can

merge my branch c2n-dju:fp-fix6622 with current django-cms:develop
do a fast-forward of c2n-dju:master to c2n-dju:fp-fix6622
do a fast-forward of c2n-dju:master to django-cms:master (not possible, there is no "django-cms:master" branch)

Eventually, I have done 1), created c2n-dju:master and done 2). Is it what you want? Why "master"?

Maybe, you want a branch "fp-fix6622-on-3.8.0"? Please, let me know!

Aiky30 · 2021-01-27T22:12:51Z

Hi @fp4code, I'm not sure if there's a quicker way mut o do the following to be sure that I have the latest. If I'm on a current working branch then I first move back out to my forked master:

'''
git checkout master
Git fetch upstream
Git pull upstream master
Git checkout Your Feature branch
Git merge master
'''

It might be possible to pull the latest changes straight in by git pull upstream master. I'll need to test this out in future.

Aiky30 · 2021-01-27T22:13:45Z

The pr no longer states that it's out of date so you must have done the update successfully. :-)

fp4code · 2021-01-27T23:56:09Z

Git pull upstream master

Hi @fp4code, I'm not sure if there's a quicker way mut o do the following to be sure that I have the latest. If I'm on a current working branch then I first move back out to my forked master:

'''
git checkout master
Git fetch upstream
Git pull upstream master
Git checkout Your Feature branch
Git merge master
'''

It might be possible to pull the latest changes straight in by git pull upstream master. I'll need to test this out in future.

I have done the same things, but with "develop" instead of "master". There is no "master" branch in django-cms I think.

fp4code · 2021-01-27T23:57:16Z

The pr no longer states that it's out of date so you must have done the update successfully. :-)

Thanks @Aiky30

fp4code · 2021-01-28T00:03:00Z

Sorry I made a confusion about closing button (my idea was to "close" a small discussion thread, not the PR of course!)

Aiky30

I'm happy with this change, thanks for your persistence.

viktor-yunenko

Makes sense to me 👍

…created or modified (django-cms#6968).

fp4code added 3 commits January 19, 2021 19:16

Fix django-cms#6622 bad Title.path in ML sites if parent slug is crea…

4d21431

…ted or modified

Add a test for multilingual title paths

10a69f9

Merge remote-tracking branch 'origin/fp-test-before-fix6622' into fp-…

bf38ccf

…fix6622

fp4code mentioned this pull request Jan 22, 2021

Fix #6622 bad Title.path in ML sites if parent slug is created or mod… #6965

Closed

3 tasks

Aiky30 changed the title ~~Pull request #6965 with tests added~~ Fix #6622 Bad Title.path in Multilanguage sites if parent slug is created or modified Jan 26, 2021

Aiky30 changed the title ~~Fix #6622 Bad Title.path in Multilanguage sites if parent slug is created or modified~~ Fix: Bad Title.path in Multilanguage sites if parent slug is created or modified Jan 26, 2021

fp4code mentioned this pull request Jan 26, 2021

Add a test for multilingual title paths #6967

Closed

3 tasks

Aiky30 requested changes Jan 26, 2021

View reviewed changes

fp4code added 2 commits January 27, 2021 09:31

Implement Aiky30 suggestions

89e8063

Resolve CHANGELOG.rst conflict

6379cf6

Aiky30 requested changes Jan 27, 2021

View reviewed changes

fp4code and others added 6 commits January 27, 2021 17:21

Update cms/tests/test_page.py

cb6a8da

Required by PEP008 validation Co-authored-by: Aiky30 <Aiky30@users.noreply.github.com>

Update cms/tests/test_page.py

738f88d

Remove empty line break Co-authored-by: Aiky30 <Aiky30@users.noreply.github.com>

Update cms/tests/test_page.py

cdead67

Comment enhancement Co-authored-by: Aiky30 <Aiky30@users.noreply.github.com>

Update cms/tests/test_page.py

01c91d7

Comment enhancement Co-authored-by: Aiky30 <Aiky30@users.noreply.github.com>

Update cms/tests/test_page.py

751cca2

Remove empty line as required by PEP 008 Co-authored-by: Aiky30 <Aiky30@users.noreply.github.com>

Update cms/tests/test_page.py

4ad2004

Remove an empty line Co-authored-by: Aiky30 <Aiky30@users.noreply.github.com>

Merge remote-tracking branch 'django-cms/develop' into fp-fix6622

98c8e2f

fp4code closed this Jan 27, 2021

fp4code reopened this Jan 27, 2021

Aiky30 approved these changes Jan 28, 2021

View reviewed changes

viktor-yunenko approved these changes Feb 5, 2021

View reviewed changes

Aiky30 merged commit 6e7b0ae into django-cms:develop Feb 6, 2021

NicolaiRidani mentioned this pull request Feb 11, 2021

Fix: Bad Title.path in Multilanguage sites if parent slug is created … NicolaiRidani/django-cms#1

Merged

3 tasks

zbohm added a commit to zbohm/django-cms that referenced this pull request Feb 22, 2021

Applied Fix: Bad Title.path in Multilanguage sites if parent slug is …

c77a6fd

…created or modified (django-cms#6968).

fp4code mentioned this pull request Apr 21, 2021

[BUG] Saving a page updates the path of all its children to <parent-path-in-different-language>/<child-slug>/ #6978

Closed

fp4code mentioned this pull request Jun 11, 2021

[BUG] Copy-paste of structure content between sites does not always work (random behavior) #7072

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Bad Title.path in Multilanguage sites if parent slug is created or modified #6968

Fix: Bad Title.path in Multilanguage sites if parent slug is created or modified #6968

fp4code commented Jan 22, 2021 •

edited

Loading

Aiky30 commented Jan 26, 2021

fp4code commented Jan 26, 2021

Aiky30 left a comment

Aiky30 Jan 26, 2021

fp4code Jan 27, 2021 •

edited

Loading

Aiky30 commented Jan 26, 2021

fp4code commented Jan 27, 2021

Aiky30 left a comment

fp4code commented Jan 27, 2021 •

edited

Loading

Aiky30 commented Jan 27, 2021

Aiky30 commented Jan 27, 2021

fp4code commented Jan 27, 2021 •

edited

Loading

Aiky30 commented Jan 27, 2021

Aiky30 commented Jan 27, 2021

fp4code commented Jan 27, 2021

fp4code commented Jan 27, 2021

fp4code commented Jan 28, 2021

Aiky30 left a comment

viktor-yunenko left a comment


		class TitlePathTestCase(CMSTestCase):

		def test0001_translated_subpage_title_path(self):

Fix: Bad Title.path in Multilanguage sites if parent slug is created or modified #6968

Fix: Bad Title.path in Multilanguage sites if parent slug is created or modified #6968

Conversation

fp4code commented Jan 22, 2021 • edited Loading

Description

Related resources

Checklist

Aiky30 commented Jan 26, 2021

fp4code commented Jan 26, 2021

Aiky30 left a comment

Choose a reason for hiding this comment

Aiky30 Jan 26, 2021

Choose a reason for hiding this comment

fp4code Jan 27, 2021 • edited Loading

Choose a reason for hiding this comment

Aiky30 commented Jan 26, 2021

fp4code commented Jan 27, 2021

Aiky30 left a comment

Choose a reason for hiding this comment

fp4code commented Jan 27, 2021 • edited Loading

Aiky30 commented Jan 27, 2021

Aiky30 commented Jan 27, 2021

fp4code commented Jan 27, 2021 • edited Loading

Aiky30 commented Jan 27, 2021

Aiky30 commented Jan 27, 2021

fp4code commented Jan 27, 2021

fp4code commented Jan 27, 2021

fp4code commented Jan 28, 2021

Aiky30 left a comment

Choose a reason for hiding this comment

viktor-yunenko left a comment

Choose a reason for hiding this comment

fp4code commented Jan 22, 2021 •

edited

Loading

fp4code Jan 27, 2021 •

edited

Loading

fp4code commented Jan 27, 2021 •

edited

Loading

fp4code commented Jan 27, 2021 •

edited

Loading