We recently got around to updating Workbench Moderation to the latest tagged 3.x release, and soon discovered a problem with our moderation workflow.

When content is edited, it is placed into moderation as normal and is sent through its paces and everything is okay. When that content is finally published, any fields attached to that content that had their values edited are displaying the old revision data, not the data for the currently published revision, i.e., the revision ID and field_*_value contain the values from the last relevant record in the field_revision_* table and not the values for the previous record, which is what is now published.

I tried this on a clean test install with only the latest tagged releases of Entity API, Drafty, and Workbench Moderation, and the results were the same.

Here is an example of the two tables from my clean test environment:

MariaDB [test_drafty_workbench]> select * from field_revision_field_moderation_test_field;
+-------------+--------+---------+-----------+-------------+----------+-------+-----------------------------------+------------------------------------+
| entity_type | bundle | deleted | entity_id | revision_id | language | delta | field_moderation_test_field_value | field_moderation_test_field_format |
+-------------+--------+---------+-----------+-------------+----------+-------+-----------------------------------+------------------------------------+
| node        | page   |       0 |         5 |          20 | und      |     0 | Test 1 a                          | NULL                               |
| node        | page   |       0 |         5 |          21 | und      |     0 | Test 1 b                          | NULL                               |
| node        | page   |       0 |         5 |          22 | und      |     0 | Test 1 a                          | NULL                               |
| node        | page   |       0 |         5 |          23 | und      |     0 | Test 1 c                          | NULL                               |
| node        | page   |       0 |         5 |          24 | und      |     0 | Test 1 b                          | NULL                               |
+-------------+--------+---------+-----------+-------------+----------+-------+-----------------------------------+------------------------------------+
5 rows in set (0.00 sec)

MariaDB [test_drafty_workbench]> select * from field_data_field_moderation_test_field;
+-------------+--------+---------+-----------+-------------+----------+-------+-----------------------------------+------------------------------------+
| entity_type | bundle | deleted | entity_id | revision_id | language | delta | field_moderation_test_field_value | field_moderation_test_field_format |
+-------------+--------+---------+-----------+-------------+----------+-------+-----------------------------------+------------------------------------+
| node        | page   |       0 |         5 |          24 | und      |     0 | Test 1 b                          | NULL                               |
+-------------+--------+---------+-----------+-------------+----------+-------+-----------------------------------+------------------------------------+
1 row in set (0.00 sec)

The published revision is 23, but the fields are displaying the data for revision 24.

How we are currently working around this is with this modification in drafty.module:

/**
 * Implements hook_entity_update().
 */
function drafty_entity_update($entity, $type) {
  $recursion_level = &drupal_static('drafty_recursion_level', 0);
  if ($recursion_level == 1) {
    // Doing this in hook_entity_update() so that the entire process is
    // completed within entity saving. However this results in two entity saves
    // within entity insert. The other option is hook_exit(), which is not
    // better since for example that would happen outside the transaction.
    //
    // This is necessary because the fields do not get updated when publishing a
    // draft revision. This also ends up creating a third copy of the revision.
    if ($entity->status === 1) {
      list($id) = entity_extract_ids($type, $entity);
      $vid = $entity->vid;
      drafty()->setRevisionToBePublished($type, $id, $vid);
    }
    drafty()->restorePublishedRevisions();
  }
  $recursion_level--;
}

This does have the drawback that a third copy of the content is created, but at least the fields are now displaying the correct data.

I have been through all the issues in this queue and tested many patches, but nothing addresses this, so I'm curious if anyone else has encountered this problem and if there is a better fix for it.

Comments

oadaeh created an issue. See original summary.

oadaeh’s picture

oadaeh commented

We updated our workaround to:

/**
 * Implements hook_entity_update().
 */
function drafty_entity_update($entity, $type) {
  $recursion_level = &drupal_static('drafty_recursion_level', 0);
  if ($recursion_level == 1) {
    // Doing this in hook_entity_update() so that the entire process is
    // completed within entity saving. However this results in two entity saves
    // within entity insert. The other option is hook_exit(), which is not
    // better since for example that would happen outside the transaction.
    //
    // This is necessary because the fields do not get updated when publishing a
    // draft revision. This also ends up creating a third copy of the revision.
    if (isset($entity->status) && $entity->status === 1 && !empty($entity->vid)) {
      list($id) = entity_extract_ids($type, $entity);
      $vid = $entity->vid;
      drafty()->setRevisionToBePublished($type, $id, $vid);
    }
    drafty()->restorePublishedRevisions();
  }
  $recursion_level--;
}

to account for entities that do not have a status or vid.

jyraya’s picture

jyraya commented

Hello,

I tried to reproduce this issue in my instance without success.

I tested with:

  • Drafty: 7.x-1.0-rc1
  • Workbench Moderation: 7.x-3.0
  • Entity API: 7.x-1.9
  • Drupal core: 7.57

I do not know if another module could affect the test scenario.

Here are the DB tables records related to my test. The last state of my tested content is:

  • A published revision (vid: 9) with NE body field value: "<p>Test 1d</p>"
  • A draft revision (vid: 9) with NE body field value: "<p>Test 1e</p>"

And here, you can find what I have in DB at that moment:

mysql> SELECT * FROM node WHERE nid = 2;
+-----+------+------+----------+-------------+-----+--------+------------+------------+---------+---------+--------+------+-----------+--------------------------------------+
| nid | vid  | type | language | title       | uid | status | created    | changed    | comment | promote | sticky | tnid | translate | uuid                                 |
+-----+------+------+----------+-------------+-----+--------+------------+------------+---------+---------+--------+------+-----------+--------------------------------------+
|   2 |    9 | page | en       | Test jyraya |   1 |      1 | 1521788031 | 1521788064 |       1 |       0 |      0 |    0 |         0 | 75cbab5f-b802-4331-9b41-5eef090d4a7d |
+-----+------+------+----------+-------------+-----+--------+------------+------------+---------+---------+--------+------+-----------+--------------------------------------+


mysql> SELECT * FROM field_data_field_ne_body WHERE entity_id = 2;
+-------------+--------+---------+-----------+-------------+----------+-------+---------------------+-----------------------+----------------------+
| entity_type | bundle | deleted | entity_id | revision_id | language | delta | field_ne_body_value | field_ne_body_summary | field_ne_body_format |
+-------------+--------+---------+-----------+-------------+----------+-------+---------------------+-----------------------+----------------------+
| node        | page   |       0 |         2 |           9 | en       |     0 | <p>Test 1 d</p>
   |                       | full_html            |
+-------------+--------+---------+-----------+-------------+----------+-------+---------------------+-----------------------+----------------------+


mysql> SELECT * FROM node_revision WHERE nid = 2;
+-----+-----+-----+-------------+-------------------+------------+--------+---------+---------+--------+--------------------------------------+
| nid | vid | uid | title       | log               | timestamp  | status | comment | promote | sticky | vuuid                                |
+-----+-----+-----+-------------+-------------------+------------+--------+---------+---------+--------+--------------------------------------+
|   2 |   2 |   1 | Test jyraya | Created by admin. | 1521788031 |      0 |       1 |       0 |      0 | 17903984-bca9-41f2-a3e3-705bf9f046ed |
|   2 |   3 |   1 | Test jyraya | Edited by admin.  | 1521788064 |      1 |       1 |       0 |      0 | 618fc664-1b0a-4ac8-8852-d2acd69739df |
|   2 |   4 |   1 | Test jyraya | Edited by admin.  | 1521788064 |      1 |       1 |       0 |      0 | 235d6dae-8124-484b-a3a6-b581be3701b1 |
|   2 |   5 |   1 | Test jyraya | Edited by admin.  | 1521788064 |      1 |       1 |       0 |      0 | 5ad89e16-604e-4ecf-8eec-78eeef502bfc |
|   2 |   6 |   1 | Test jyraya | Edited by admin.  | 1521788064 |      1 |       1 |       0 |      0 | d7b8d1aa-d0bc-44cd-972e-78a24d8940f1 |
|   2 |   7 |   1 | Test jyraya | Edited by admin.  | 1521788064 |      1 |       1 |       0 |      0 | 9382477c-a7bc-4734-b358-0be98a6de191 |
|   2 |   8 |   1 | Test jyraya | Edited by admin.  | 1521788064 |      1 |       1 |       0 |      0 | 99fef0d9-7374-402d-af57-c3a030c6c274 |
|   2 |   9 |   1 | Test jyraya | Edited by admin.  | 1521788064 |      1 |       1 |       0 |      0 | f6e6ed13-5c6b-4820-a245-d4b6b291acd0 |
+-----+-----+-----+-------------+-------------------+------------+--------+---------+---------+--------+--------------------------------------+


mysql> SELECT * FROM field_revision_field_ne_body WHERE entity_id = 2;
+-------------+--------+---------+-----------+-------------+----------+-------+---------------------+-----------------------+----------------------+
| entity_type | bundle | deleted | entity_id | revision_id | language | delta | field_ne_body_value | field_ne_body_summary | field_ne_body_format |
+-------------+--------+---------+-----------+-------------+----------+-------+---------------------+-----------------------+----------------------+
| node        | page   |       0 |         2 |           2 | en       |     0 | <p>Test 1 a</p>
   |                       | full_html            |
| node        | page   |       0 |         2 |           3 | en       |     0 | <p>Test 1 b</p>
   |                       | full_html            |
| node        | page   |       0 |         2 |           4 | en       |     0 | <p>Test 1 c</p>
   |                       | full_html            |
| node        | page   |       0 |         2 |           5 | en       |     0 | <p>Test 1 b</p>
   |                       | full_html            |
| node        | page   |       0 |         2 |           6 | en       |     0 | <p>Test 1 b</p>
   |                       | full_html            |
| node        | page   |       0 |         2 |           7 | en       |     0 | <p>Test 1 d</p>
   |                       | full_html            |
| node        | page   |       0 |         2 |           8 | en       |     0 | <p>Test 1 e</p>
   |                       | full_html            |
| node        | page   |       0 |         2 |           9 | en       |     0 | <p>Test 1 d</p>
   |                       | full_html            |
+-------------+--------+---------+-----------+-------------+----------+-------+---------------------+-----------------------+----------------------+


mysql> SELECT * FROM workbench_moderation_node_history WHERE nid = 2;
+-----+-----+-----+--------------+--------------+-----+------------+-----------+------------+
| hid | vid | nid | from_state   | state        | uid | stamp      | published | is_current |
+-----+-----+-----+--------------+--------------+-----+------------+-----------+------------+
|   1 |   2 |   2 | draft        | draft        |   1 | 1521788031 |         0 |          0 |
|   2 |   3 |   2 | draft        | needs_review |   1 | 1521788049 |         0 |          0 |
|   3 |   3 |   2 | needs_review | validated    |   1 | 1521788059 |         0 |          0 |
|   4 |   3 |   2 | validated    | published    |   1 | 1521788064 |         0 |          0 |
|   5 |   4 |   2 | published    | draft        |   1 | 1521789060 |         0 |          0 |
|   6 |   5 |   2 | published    | published    |   1 | 1521789060 |         0 |          0 |
|   7 |   4 |   2 | draft        | needs_review |   1 | 1521789234 |         0 |          0 |
|   8 |   6 |   2 | published    | published    |   1 | 1521789234 |         0 |          0 |
|   9 |   4 |   2 | needs_review | published    |   1 | 1521789291 |         0 |          0 |
|  10 |   7 |   2 | published    | published    |   1 | 1521789312 |         0 |          0 |
|  11 |   8 |   2 | published    | needs_review |   1 | 1521790844 |         0 |          1 |
|  12 |   9 |   2 | published    | published    |   1 | 1521790844 |         1 |          0 |
+-----+-----+-----+--------------+--------------+-----+------------+-----------+------------+

I also observed the DB when I published the content the first time and a second time without any draft revision.

In the 3 cases, I always received the expected behaviour and values.

Could you give revision history of the "workbench_moderation_node_history" table for your tested content?

oadaeh’s picture

oadaeh commented
Status: Active » Postponed (maintainer needs more info)

@jyraya I will try to get the "workbench_moderation_node_history" table for you some time this week.