When I create a new node, I end up with two revisions (One fake and active one and a second with the content I have submitted). When I view the node, I see the fake one and I get a warning (This document has 1 pending revision). Up to now, everything seems good. Now, I expect to see the 'Revision' block to allow me to moderate this pending revision. However, it still doesn't show up. I had a look at the code and it only shows up is $node->vid and $live->vid are different. This is were I'm confused. $node->vid is the fake revision to be displayed and $live->vid is the same one. Shouldn't $live->vid be the pending revision one in order to display the block to moderate it?

Comments

eugenmayer’s picture

eugenmayer commented
Title: Revision block not displayed when pending revision(s) » Show content moderation on every content moderated node
Assigned: Unassigned » eugenmayer
Category: support » task
Status: Active » Needs work

Well while this one on pupose, your idea of the UI is better.

My idea was, that tha block is shown, when you look at a revision. While you use the "revision list" provided by Drupal core, so node/ID/revisions to select one.
But i guess thats rather complicated to explain to a enduser.

I would add a list of the latest 5 revisions to the block. You can see the states of the revisions, change the status and view the revision. In addition there would be a "more revisions" which leads to node/id/revisions.

Do you like that idea?

eugenmayer’s picture

eugenmayer commented
Title: Show content moderation on every content moderated node » Show content moderation info block on every content moderated node
pvasener’s picture

pvasener commented

Good, I understand better now. I agree that your initial implementation is rather user-unfriendly. Besides, it doesn't seem to work because $node->vid is the currently published version rather than the version viewed, isn't it ? Then, to get the correct $vid, you will need to get it from DB or $q. Sounds quite bad...

Anyway, the way you suggested to modify the block visibility and useability seems much better.

eugenmayer’s picture

eugenmayer commented

$node is the currently viewed one

$node = menu_get_object('node');
pvasener’s picture

pvasener commented

Yes, but it seems that menu_get_object() returns the node with the $vid stored in the DB and not the one in the URL. This is what I got from my tests.

eugenmayer’s picture

eugenmayer commented
Status: Needs work » Fixed

You were right with menu_get_object to caring about the revision in the URL. Fixed that.

released in BETA 3

pvasener’s picture

pvasener commented
Version: 6.x-1.0-beta2 » 6.x-1.0-beta3
Status: Fixed » Needs work

Unfortunately, it looks like beta3 is very similar to beta1. The patches I have submitted are no longer applied and nothing has changed about this issue. (I don't reopen the other issues as I guess you are going to release a proper beta 4)

eugenmayer’s picture

eugenmayer commented
Status: Fixed » Needs work

Well yeah, this feature was brought to you by CVS 'genius interface and technology'.......
Rolling out beta 4

eugenmayer’s picture

eugenmayer commented
Status: Needs work » Fixed
eugenmayer’s picture

eugenmayer commented
Status: Needs work » Closed (fixed)