Problem/Motivation

Backport the combined patches in #2914873: The "from state" used for calculating available transitions is changed when using the content moderation state widget and preview mode and #3065802: Preview and content moderation widget broken for unsaved entities to 8.7.

Proposed resolution

Remaining tasks

User interface changes

API changes

Data model changes

Release notes snippet

CommentFileSizeAuthor
#10 interdiff-3065804-6-10.txt11.53 KBchr.fritsch
#10 3065804-10.patch9.48 KBchr.fritsch
#10 3065804-10-test-only.patch3.95 KBchr.fritsch
#7 3065804-6.patch15.28 KBchr.fritsch
#6 3077822-6.patch4.48 KBchr.fritsch
#6 3065804-6-test-only.patch5.33 KBchr.fritsch
#4 3065804-4.patch15.28 KBchr.fritsch

Comments

Sam152 created an issue. See original summary.

sam152’s picture

sam152 commented
Issue summary: View changes
chr.fritsch’s picture

chr.fritsch
he/him
Primary language German
Location 🇩🇪🇪🇺🌍
commented
Title: [PP-1] Backport content moderation preview fixes to 8.7 » Backport content moderation preview fixes to 8.7
Status: Postponed » Active

Both patches landed in 8.8.x now.

chr.fritsch’s picture

chr.fritsch
he/him
Primary language German
Location 🇩🇪🇪🇺🌍
commented
Status: Active » Needs review
StatusFileSize
new 3065804-4.patch15.28 KB

Here is the combined patch of the two listed issues.

jibran’s picture

jibran
he/him
Primary language Urdu
Location Toronto, Canada
commented
Category: Task » Bug report
Status: Needs review » Reviewed & tested by the community

As it is combining the fixes from two bug reports, this should be classified as a bug. I don't think we can commit it to 8.7 if we classify it as a task. Given that we should have a red patch here as well other than that this issue is RTBC.

chr.fritsch’s picture

chr.fritsch
he/him
Primary language German
Location 🇩🇪🇪🇺🌍
commented
StatusFileSize
new 3065804-6-test-only.patch5.33 KB
new 3077822-6.patch4.48 KB

Re-uploading #4

chr.fritsch’s picture

chr.fritsch
he/him
Primary language German
Location 🇩🇪🇪🇺🌍
commented
StatusFileSize
new 3065804-6.patch15.28 KB

Uploaded the wrong patch... 🤦🏻‍♂️

The last submitted patch, 6: 3065804-6-test-only.patch, failed testing. View results

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented
Status: Reviewed & tested by the community » Needs work 
+++ b/core/modules/content_moderation/src/ModerationInformationInterface.php
@@ -198,4 +198,26 @@ public function getWorkflowForEntityTypeAndBundle($entity_type_id, $bundle_id);
+  public function getOriginalState(ContentEntityInterface $entity);

I'm not sure that we should be adding this interface change in 8.7.x

As far as I can see #2914873-53: The "from state" used for calculating available transitions is changed when using the content moderation state widget and preview mode had the fix without the interface change by duplicating code.

chr.fritsch’s picture

chr.fritsch
he/him
Primary language German
Location 🇩🇪🇪🇺🌍
commented
Status: Needs work » Needs review
StatusFileSize
new 3065804-10-test-only.patch3.95 KB
new 3065804-10.patch9.48 KB
new interdiff-3065804-6-10.txt11.53 KB

Ok, so here is a patch without the interface change.

The last submitted patch, 10: 3065804-10-test-only.patch, failed testing. View results

volkerk’s picture

volkerk commented
Status: Needs review » Reviewed & tested by the community

ModerationInformationInterface is not changed anymore, functionality is moved back to the widget.
Looks good to me.

jibran’s picture

jibran
he/him
Primary language Urdu
Location Toronto, Canada
commented

@chr.fritsch thanks for addressing the feedback.

RTBC+1.

It is not DRY but the things we do in the name of BC :D

sam152’s picture

sam152 commented

Looks great, thanks for seeing it through +1 :)

Version: 8.7.x-dev » 8.8.x-dev

Drupal 8.7.9 was released on November 6 and is the final full bugfix release for the Drupal 8.7.x series. Drupal 8.7.x will not receive any further development aside from security fixes. Sites should prepare to update to 8.8.0 on December 4, 2019. (Drupal 8.8.0-beta1 is available for testing.)

Bug reports should be targeted against the 8.8.x-dev branch from now on, and new development or disruptive changes should be targeted against the 8.9.x-dev branch. For more information see the Drupal 8 and 9 minor version schedule and the Allowed changes during the Drupal 8 and 9 release cycles.

xjm’s picture

xjm
she/her
Primary language English
commented
Version: 8.8.x-dev » 8.7.x-dev
Status: Reviewed & tested by the community » Closed (won't fix)
Issue tags: +DrupalSouth 2019

Thanks for working on this! Unfortunately this can't go in anymore because 8.7.9 was released on November 6 as the final bugfix release of 8.7, and there will be no more commits to the branch other than security fixes.

However, my understanding is this fix is already available in 8.8, and 8.8.0 will be released very soon on December 4.

Thanks