Revision Moderation Drupal 7 port

I get this error on enabling the module. It ends up enabled and adds the "revisions in moderation" checkbox, but doesn't seem to prevent the revision from being immediately visible.

I am also hoping for the Revisioning port, but in the short term I was going to try this. I was sad when it didn't work. You mentioned known bugs in your patch. Do you mind listing them here so we can begin working through them?

It did indeed install error free :)

Getting the same issues though. The original revision is marked as current if you view the rev history, but the latest one is actually displayed. I haven't had a chance to get to any code today, but I hope to have some time to look at it tomorrow.

OK, it's pretty simple, actually. The solution though...not so simple. I'm still thinking about that.

The module is working exactly as designed. The problem is that node_save() saves the new node content at the same time it saves the revision.

We have two options here:

• We can save the revision in hook_node_presave() and then munge the node back to original contents. We'd have to prevent Drupal from then saving yet another revision.
• We can save the original content back over the node in our existing hook_node_update() function. This is what I'm attempting to do now, with the code below, but it doesn't seem to be working right.
  

        $onode = $node->original_node;
        $onode->vid = $node->vid;
        drupal_write_record('node', $onode, 'nid');
        _node_save_revision($onode, $onode->uid, 'vid');
  

I'll keep you updated and let you know when I get it working.

Hello there.
From 5-6h i'm trying to patch that module and include it to D7.
I'm changing somethings what u dont see.
But still dunn work.

Do u have any new suggestions ?

This patch works fully as far as I can tell. The key was figuring out how the new fields system worked. Run my patches with -p1. The first patch is against HEAD, the second is against the patch in #7.

This cleans up a bunch of minor style issues too.

It does have one possibly major bug--seen on the content type page--, and a handful of problem areas. All are identified by coder. Once I figure out the logic in revision_moderation_form_alter, I'll attempt to migrate it to hook_form_FORM_ID_alter() and fix that one.

Against HEAD

This moves the config link from the admin bar on top into config/content where it should be.

Subscribing

subscribing

@Azol
That patch is for what version of RM ?
because on revision_moderation 6.x-1.x-dev
i have a lot of errors in

patch -p1 < 995876-revision_moderation_d7_1.patch

f.e. in http://localhost/admin/content/node/revisions

PDOException: SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''50'' at line 1: SELECT n.nid, r.vid, n.type, r.title, r.uid, r.timestamp FROM {node} n INNER JOIN {node_revision} r ON n.nid = r.nid WHERE r.vid > n.vid ORDER BY r.vid DESC LIMIT :limit; Array ( [:limit] => 50 ) w revision_moderation_get_all_pending_revisions() (line 372 z /var/www/modules/revision_moderation/revision_moderation.module).

subscribing

On apply that patch I dont have any errors.
But RM still doesnt work clear.
http://localhost/admin/content/node/revisions

give me that error msg
PDOException: SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''50'' at line 1: SELECT n.nid, r.vid, n.type, r.title, r.uid, r.timestamp FROM {node} n INNER JOIN {node_revision} r ON n.nid = r.nid WHERE r.vid > n.vid ORDER BY r.vid DESC LIMIT :limit; Array ( [:limit] => 50 ) w revision_moderation_get_all_pending_revisions() (line 396 z /var/www/drupal7/modules/revision_moderation/revision_moderation.module).

Btw sql query

SELECT n.nid, r.vid, n.type, r.title, r.uid, r.timestamp FROM node n INNER JOIN node_revision r ON n.nid = r.nid WHERE r.vid > n.vid ORDER BY r.vid DESC LIMIT 50

really give me 0

Try replacing the parameter with a hardcoded value and see if the error goes away. I'm unable to replicate it on pgsql and sqlite.

$result = db_query('SELECT n.nid, r.vid, n.type, r.title, r.uid, r.timestamp FROM {node} n INNER JOIN {node_revision} r ON n.nid = r.nid WHERE r.vid > n.vid ORDER BY r.vid DESC LIMIT 50');

subscribing

Thanks for the work on this. It definitely looks like a great start. I should have more time to look at it this weekend. One thing I don't see offhand is any mention of hook_schema_alter to work with the moderate field in the node table if it's already present or add it if it's not.

Exactly which is why it's necessary to use hook_schema_alter in order to maintain backwards compatibility. Note that because it was dropped from the schema does not mean that it won't be present for D6 module users upgrading to the D7 version.

The current version w/ patches applied now errors if you click the publish link within the revision view. It works fine when you use the revert link in the list of all revisions.

Are you sure you want to publish this revision for ?
Error message
Notice: Trying to get property of non-object in revision_moderation_publish_confirm() (line 439 of /ld/www/htdocs/sys/sops/sites/all/modules/revision_moderation/revision_moderation.module).
Notice: Trying to get property of non-object in revision_moderation_publish_confirm() (line 440 of /ld/www/htdocs/sys/sops/sites/all/modules/revision_moderation/revision_moderation.module).
Notice: Trying to get property of non-object in revision_moderation_publish_confirm() (line 441 of /ld/www/htdocs/sys/sops/sites/all/modules/revision_moderation/revision_moderation.module).
Notice: Trying to get property of non-object in revision_moderation_publish_confirm() (line 442 of /ld/www/htdocs/sys/sops/sites/all/modules/revision_moderation/revision_moderation.module).
Notice: Trying to get property of non-object in revision_moderation_publish_confirm() (line 444 of /ld/www/htdocs/sys/sops/sites/all/modules/revision_moderation/revision_moderation.module).
Notice: Trying to get property of non-object in revision_moderation_publish_confirm() (line 444 of /ld/www/htdocs/sys/sops/sites/all/modules/revision_moderation/revision_moderation.module).
Notice: Trying to get property of non-object in revision_moderation_publish_confirm() (line 444 of /ld/www/htdocs/sys/sops/sites/all/modules/revision_moderation/revision_moderation.module).

This patch fixes my last post. The edit link is still broken, but I don't have time to finish it today. I'll fix it on Monday.

well that was more of a pain in the ass than I expected.

subscribing

subscribe

This patch is to make it so that nodes created before revision_moderation module is installed can work with revision_moderation too. This is based on comment HEAD + comment #24, #31, #32

subscribe

Which branch are the patches in this thread based on? HEAD, 7.x-1.x, 6.x-1.x?

Okay, attached is a new patch against the (git) master branch incorporating #24, #31, #32 and #35.

Overall the port seems to be working nicely; two things I found while testing the patch:

• When viewing an unpublished revision the "status message" says "by Anonymous" instead of my username.
  You are currently viewing a revision of this post created on Sat, 02/26/2011 - 16:26 by Anonymous (not verified).
• When I activate the diff module (7.x-1.x-dev) I cannot open the revisions page anymore (blank page). The error message is:
  Warning: Parameter 1 to diff_diffs_overview() expected to be a reference, value given in menu_execute_active_handler() (line 501 of /var/www/bf_d7test/public_html/includes/menu.inc).
• It is currently possible to "revert" unpublished revisions... The "revisions" page should probably show a "publish" operation instead of the "revert" operation.

Grumble. Apparently this module cannot handle more than one file either! I'll start working on fixing that on Friday.

I've moved over to http://drupal.org/project/workbench_moderation, which is much nicer than this module.

And they're all in different states of working or almost working now too!

Thanks binford2k for mentioning http://drupal.org/project/workbench_moderation

I spoke with Bec last week at Drupalcon and unless something unforeseen comes up I see workbench moderation as the way forward. The plan will be to write a conversion for sites moving from Revision Moderation in Drupal 6 to workbench moderation in Drupal 7 but there is enough overlap that it doesn't seem to make sense to keep both modules going forward.

Thanks for combining forces! I think that's a great plan and I'll be happy to help. There are still some missing features (such as Rules support) that I want to add to WBM. I'm using some lessons I learned from reading your code to get WBM in a state that I could use it.

Would be wonderfull to have an upgrade path from Revision Moderation 6.x to Workbench 7.x if this is going to happen.
Otherwise it makes sense.
Great job with this module. Total life saver for me.

Inquired at Workbench Moderation on how to mimic Revision Moderation functionality:
#1136134: Update path from Revision Moderation

Coming here from #542290: Make it easier to create draft revisions in core.

This module currently updates the vid in hook_node_update().

As you know this doesn't work in Drupal 7 due to Field API's model of always keeping the latest revision.

I ran into this on http://drupal.org/node/282122#comment-1927444 and that comment has working code (at least it worked on the time), which instead of munging the vid, clones the 'active' revision, saves the new one, then adds the active revision back to the top of the list. It is a workaround, but it's arguably no more of a workaround than changing vids around with direct database queries.

It should be possible to do that workflow without a core patch, but if it's not we could try to add helper functions (such as node_delete_revision() from that patch) to core to make it easier.

As mentioned on the Revision Moderation project page, if you like the style of this module, Revisioning may be a better fit, as it has its origins in Revision Moderation and a similar, but improved, UI. Over the last couple of years Revisioning has evolved a lot further than Revision Moderation.
Revisioning version is available now for both 6.x and 7.x