Skip to content
New issue

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

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EZP-29694: Draft conflict does not work as expected for a content item with multiple translations #950

Merged
merged 4 commits into from
Apr 18, 2019
Merged

EZP-29694: Draft conflict does not work as expected for a content item with multiple translations #950

merged 4 commits into from
Apr 18, 2019

Conversation

ViniTou
Copy link
Contributor

@ViniTou ViniTou commented Apr 8, 2019 •
edited
Loading

Question Answer
Tickets https://jira.ez.no/browse/EZP-29694
Bug fix? yes
New feature? no
BC breaks? yes
Tests pass? yes
Doc needed? yes
License GPL-2.0

This, together with ezsystems/ezpublish-kernel#2598 should align how adminUI behaves comparing to ezPublish.
This ticket should also be solved by this:
https://jira.ez.no/browse/EZP-29691

BC:
Additional route parameter was needed.
not sure if Specifications are under BC though

Checklist:

  • Coding standards ($ composer fix-cs)
  • Ready for Code Review

@ViniTou ViniTou requested review from mikadamczyk, webhdx, adamwojs and dew326 and removed request for mikadamczyk April 8, 2019 11:12
dew326
dew326 approved these changes Apr 8, 2019
View reviewed changes
src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js Outdated
@@ -49,6 +48,10 @@
attachModalListeners(wrapper);
};
const changeHandler = () => {
const checkedBtn = btns.find((btn) => btn.checked);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about small optimization?
You can get the changed button from the event - event.currentTarget
Also, languageCode can be passed this to the redirectToUserEdit method.

@ViniTou ViniTou requested a review from dew326 April 9, 2019 08:51
@ViniTou ViniTou force-pushed the EZP-29694-copy-translations-from-published branch from 7c9f460 to 5ce4329 Compare April 9, 2019 13:54
@ViniTou ViniTou changed the base branch from 1.4 to master April 9, 2019 13:54
@ezrobot

This comment has been minimized.

Sign in to view
@micszo micszo self-assigned this Apr 10, 2019
@ViniTou ViniTou force-pushed the EZP-29694-copy-translations-from-published branch from 8e52a71 to 4d0b02f Compare April 10, 2019 13:48
@ViniTou ViniTou mentioned this pull request Apr 10, 2019
Merged
5 tasks
alongosz added a commit that referenced this pull request Apr 11, 2019
@alongosz
EZP-29694: Draft conflict does not work as expected for a content ite…
9566437 
…m with multiple translations (#950)

Squashed commit of the following:

commit 4d0b02f
Author: Dawid Parafiński <[email protected]>
Date:   Tue Apr 9 16:03:39 2019 +0200

    EZP-29694: missed cs fixer from another PR

commit d3bdc5f
Author: Dawid Parafiński <[email protected]>
Date:   Tue Apr 9 10:34:34 2019 +0200

    EZP-29694: refactor js

commit a1fc745
Author: Dawid Parafiński <[email protected]>
Date:   Tue Apr 9 10:34:13 2019 +0200

    EZP-29694: fix & add unit tests

commit d80d379
Author: Dawid Parafiński <[email protected]>
Date:   Mon Apr 8 12:59:56 2019 +0200

    EZP-29694: Draft conflict does not work as expected for a content item with multiple translations

commit f4f0ac5
Merge: 336cbfe 05be271
Author: Marek Nocon <[email protected]>
Date:   Wed Apr 10 14:05:46 2019 +0200

    Merge branch '1.4'

commit 05be271
Merge: 014fda3 45c212c
Author: Łukasz Serwatka <[email protected]>
Date:   Wed Apr 10 13:36:57 2019 +0200

    Merge pull request #955 from mnocon/add-fixer-job

    Add php-cs-fixer Travis job

commit 336cbfe
Merge: b56f590 f1141d3
Author: Łukasz Serwatka <[email protected]>
Date:   Wed Apr 10 13:34:09 2019 +0200

    Merge pull request #957 from ezsystems/EZEE-2736

    EZEE-2736 [Travis][Behat] Non-deterministic errors in Form- and Page-Builders

commit f1141d3
Author: m-tyrala <[email protected]>
Date:   Wed Apr 10 11:23:00 2019 +0200

    EZEE-2736 [Travis][Behat] Non-deterministic errors in Form- and Page-Builders

commit b56f590
Merge: bb13a5a 5cb56bf
Author: Łukasz Serwatka <[email protected]>
Date:   Wed Apr 10 09:47:40 2019 +0200

    Merge pull request #948 from ezsystems/EZP-30399-lang-attribute-on-html-element-is-incorrect

    EZP-30399: Fix lang attribute on <html> element

commit 45c212c
Author: Marek Nocon <[email protected]>
Date:   Wed Apr 10 09:35:12 2019 +0200

    Add CS job

commit bb13a5a
Merge: bc9a340 7565cfb
Author: Łukasz Serwatka <[email protected]>
Date:   Tue Apr 9 14:53:54 2019 +0200

    Merge pull request #954 from ezsystems/EZP-30425-content-view-is-shrunk-slip-during-merge-up

    EZP-30425: Content view is shrunk - Remove redundant div added during merge-up

commit 7565cfb
Author: Jakub Brzegowski <[email protected]>
Date:   Tue Apr 9 14:51:32 2019 +0200

    EZP-30425: Remove redundant div added during merge-up

commit bc9a340
Merge: 4b692a6 014fda3
Author: Jakub Brzegowski <[email protected]>
Date:   Tue Apr 9 12:43:27 2019 +0200

    Merge remote-tracking branch 'origin/1.4'

commit 014fda3
Author: Jakub <[email protected]>
Date:   Tue Apr 9 12:01:53 2019 +0200

    EZEE-2749: Fix text overflow and table breaking interface in Notifications popup table (#951)

commit 4b692a6
Merge: f022bb9 c3a63c2
Author: Dariusz Szut <[email protected]>
Date:   Mon Apr 8 15:52:22 2019 +0200

    Merge remote-tracking branch 'origin/1.4'

commit c3a63c2
Author: dew326 <[email protected]>
Date:   Mon Apr 8 15:49:11 2019 +0200

     EZP-29963: In rich text editor, inline style in table triggers a javascript error (#949)

    * EZP-29963: In rich text editor, inline style in table triggers a javascript error

    * compiled AE

commit f022bb9
Merge: b9e4329 02c8e00
Author: kzawada <[email protected]>
Date:   Mon Apr 8 15:18:12 2019 +0200

    Merge branch '1.4'

commit 02c8e00
Merge: cab605d 3d57889
Author: Łukasz Serwatka <[email protected]>
Date:   Mon Apr 8 15:11:54 2019 +0200

    Merge pull request #944 from katarzynazawada/EZEE-2747-copy-subtree

    EZEE-2747 Implement minimal test coverage for Copy subtree

commit cab605d
Author: Dawid Parafiński <[email protected]>
Date:   Mon Apr 8 14:24:13 2019 +0200

    EZP-30367: Error: `Location cannot be displayed as it is flagged as invisible.` (#936)

    * EZP-30367: Error: `Location cannot be displayed as it is flagged as invisible.`

    * EZP-30367: Check for null locationId

commit 3d57889
Author: kzawada <[email protected]>
Date:   Wed Apr 3 15:32:40 2019 +0200

    EZEE-2747 Implement minimal test coverage for Copy subtree

commit b9e4329
Merge: a683324 5ecf71b
Author: Dariusz Szut <[email protected]>
Date:   Mon Apr 8 11:33:57 2019 +0200

    Merge remote-tracking branch 'origin/1.4'

commit 5ecf71b
Merge: 993a443 1722df4
Author: Łukasz Serwatka <[email protected]>
Date:   Mon Apr 8 11:10:07 2019 +0200

    Merge pull request #947 from dew326/ezp-29808-wrong-language-mfu

    EZP-29808: Newly created content via Multi Upload has wrong language set

commit a683324
Author: Serhey Dolgushev <[email protected]>
Date:   Fri Apr 5 09:11:58 2019 -0400

    EZP-30386: [Online Editor] Custom Buttons (#943)

    * EZP-30386: [Online Editor] Custom Buttons

    * EZP-30386: [Online Editor] Custom Buttons, mention that it will be deprecated in 3.x

    * EZP-30386: [Online Editor] Custom Buttons, implementing requested changes

    * EZP-30386: [Online Editor] Compile assets for the BC reasons

    * EZP-30386: [Online Editor] Custom Buttons, implementing requested changes

    * EZP-30386: [Online Editor] Compile assets for the BC reasons

commit 5cb56bf
Author: Jakub Brzegowski <[email protected]>
Date:   Fri Apr 5 14:36:06 2019 +0200

    EZP-30399: Fix lang attribute on <html> element

commit 1722df4
Author: Dariusz Szut <[email protected]>
Date:   Fri Apr 5 10:38:57 2019 +0200

    EZP-29808: Newly created content via Multi Upload has wrong language set
alongosz added a commit that referenced this pull request Apr 17, 2019
@alongosz
EZP-29694: Draft conflict does not work as expected for a content ite…
80aac62 
…m with multiple translations (#950)

Squashed commit of the following:

commit 4d0b02f
Author: Dawid Parafiński <[email protected]>
Date:   Tue Apr 9 16:03:39 2019 +0200

    EZP-29694: missed cs fixer from another PR

commit d3bdc5f
Author: Dawid Parafiński <[email protected]>
Date:   Tue Apr 9 10:34:34 2019 +0200

    EZP-29694: refactor js

commit a1fc745
Author: Dawid Parafiński <[email protected]>
Date:   Tue Apr 9 10:34:13 2019 +0200

    EZP-29694: fix & add unit tests

commit d80d379
Author: Dawid Parafiński <[email protected]>
Date:   Mon Apr 8 12:59:56 2019 +0200

    EZP-29694: Draft conflict does not work as expected for a content item with multiple translations
micszo
micszo approved these changes Apr 17, 2019
View reviewed changes
Copy link
Member

@micszo micszo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested with https://github.com/ezsystems/ezplatform-admin-ui/tree/for-qa-ezp-30344-ezp-29694-transl-combo.

@micszo micszo removed their assignment Apr 17, 2019
@alongosz alongosz merged commit 6c5b0f9 into ezsystems:master Apr 18, 2019
konradoboza pushed a commit to konradoboza/ezplatform-admin-ui that referenced this pull request May 29, 2019
@ViniTou
EZP-29694: Draft conflict does not work as expected for a content ite…
79ccb5a 
…m with multiple translations (ezsystems#950)

Note: possible due to introducing of copying missing previously published translations to drafts via  ezsystems/ezpublish-kernel#2598
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikadamczyk mikadamczyk mikadamczyk approved these changes

@Nattfarinn Nattfarinn Nattfarinn approved these changes

@dew326 dew326 dew326 approved these changes

@micszo micszo micszo approved these changes

@webhdx webhdx Awaiting requested review from webhdx

@adamwojs adamwojs Awaiting requested review from adamwojs

Assignees
No one assigned
Labels
QA approved
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ViniTou @ezrobot @mikadamczyk @Nattfarinn @dew326 @micszo @alongosz