Incorporate Diff to Compare Revisions

I second the motion. A diff-like comparison of revisions would be a big bonus for Workbench. The current method of shuffling between the revisions is not real user friendly.

Thanks also for the work you have put into these modules. They look to have great potential. Workflow is a critical factor for many sites but the implementation is still rather immature in Drupal 7. Hopefully Workbench will address this.

subscribe.

Hey Mike, how's that patch coming?

The diff menu handlers work fine, so it's really just a matter of exposing that functionality in the UI. I wouldn't use jquery to do it. Add it to the forms using FAPI. You can see how it's done right in the diff module.

Right now I'm using the inline diff block and it works really well, but I'd like the ability to choose arbitrary left/right revisions too.

Subscribing

subscribe

If we do integrate directly with the Diff module we will have to account for colliding uses of hook_menu_alter() that cause node/%nid/revisions to break on unmoderated content types.

#1089834: Call to undefined function node_revision_overview()

Any more progress on this?

--Ben

Subscribing

Diff would be useful. Subscribing.

Dear Steve, as you are aware Diff is currently clashing with Workbench moderation. If you could come up with an alternative to using node/%node/revisions in the hook_alter_menu() to avoid this clash, I would sincerely appreciate it!

Varun

Subscribe.

subscribe

man this would be great!

I am marking this critical but not a blocker for a 1.0 release.

sub

I'm working on this now and I'm running into a bit of a UI blocker. I thought I'd be repurposing the Diff column from the Diff UI as a column in the Workbench Moderation UI. This approach would yield a form within a form which is invalid HTML. See these screenshots.

http://drupal.org/files/wbm_ui_skitched.jpg
http://drupal.org/files/diff_ui_skitched.jpg

I'm not committed to reusing the Diff UI as is since the double radio buttons can be confusing so I'm open to suggestion. A new UX designer at Palantir, Patrick Grady, suggested making the rows themselves clickable (possibly with a hidden checkbox). This reminded me of Views Bulk Operations which does something similar. I'd be willing to convert this page to a View but that doesn't solve the form within a form problem.

Perhaps the the mini moderation form needs to be moved of of the table if Diff is on. Or maybe it's just always outside of the table.

Make a sub-tab off of the moderate local task called 'Diff' and put the diff code there until we can figure out a better way to do or clean this up.

node/%node/moderate
node/%node/moderate/moderate
node/%node/moderate/diff

I have code that does this already for scheduling if you need it.

Can we reserve critical for things that absolutely break workbench suite and use major instead for things we really want to get done?

On it.

So this gets the job done in the way #22 describes. I'm not crazy about using module_exists(). I don't see a way around it beside making this functionality a sub/spinoff module that depends on diff.

subscribe

sub.

I tested #24, and it was working for me, i could get to the diff page.

subscribe

Tested #24. Works like a charm, although it would be nice if the Diff page was also part of hook_admin_path.

Patch #24 works.

Here is a quick idea how the diff tab functionality could be integrated with the moderate tab.

+1 for the idea in #31!

subscribing. Is this planned for incorporation into a future release now?

Patch #24 works here. -> RTBC +1

Each revision can have its own "revision note" (the field that is only visible in edit view and not on node display) - it would be very practical if those notes were displayed either after selecting in that drop-down box _before_ clicking on compare, or even in the very drop-down menu itself? (Maybe this should be a subsequent new/separate feature request and not hold up this issue from being committed, though.)

+1 very much need.

Has this feature been added in the dev version? In Drupal 7.9 with Workbench Moderation 7.x-1.1, I'm getting this error when enabling the Diff Module:

Fatal error: Call to undefined function node_revision_overview() in . . . sites/all/modules/workbench_moderation/workbench_moderation.module on line 169

I'm trying to find some way to have a diff feature without the error.

Thanks

Cohen, I'm not sure what's causing that error, but try this. Disable the Workbench Moderation module, then enable the Diff module. If that succeeds, try re-enabling the Workbench Moderation module. Hope that works.

The patch for this is from August. Any word on the hold up on getting this in?

I'm also setting this to a bug. When workbench moderation is enabled the UI for doing diffs is removed via workbench_moderation_menu_alter(). This is a bug.

I'll echo @mfer's comments - any word on when this is being rolled into a release?

I've committed #24 and opened another issue in 2.x for a more thorough UI integration. #1404642: Better diff integration

Updated to 7.x-1.x-dev (January 14). Got an error on unused (not draft, not current public) revision view at /node%/revisions/%/view:

    Notice: Undefined offset: 0 в функции DrupalDiffInline->process_chunk() (строка 1279 в файле /.../sites/all/modules/diff/DiffEngine.php).
    Notice: Undefined offset: 2 в функции DrupalDiffInline->process_chunk() (строка 1283 в файле /.../sites/all/modules/diff/DiffEngine.php).
    Notice: Undefined index: #view_mode в функции eva_entity_view_alter() (строка 44 в файле /.../sites/all/modules/eva/eva.module).
    Notice: Undefined index: #language в функции eva_entity_view_alter() (строка 45 в файле /.../sites/all/modules/eva/eva.module).
    Notice: Undefined index: #entity_type в функции _eva_extract_entity_from_build() (строка 152 в файле /.../sites/all/modules/eva/eva.module).
    Notice: Undefined index: #entity_type в функции _eva_extract_entity_from_build() (строка 157 в файле /.../sites/all/modules/eva/eva.module).
    Notice: Undefined index: #entity_type в функции _eva_extract_entity_from_build() (строка 160 в файле /.../sites/all/modules/eva/eva.module).
    EntityMalformedException: Отсутствует связующее свойство у сущности типа node. в функции entity_extract_ids() (строка 7409 в файле /.../includes/common.inc).

PHP and Drupal are in Russian language.

Forgot to change status.

It's EVA module. EVA+diff works, EVA+workbench_moderation works. EVA+diff+workbench_moderation fails.

Not sure why this got closed, its not fixed yet!

Rerolled patch adding functionality requested in #30, so that the diff comparison page will use the admin theme, if you have one!

This "works for me" but i would also second incorporating this functionality *directly* into the workbench moderation revisions listing page, as requested in #31. Heck i might just keep working on this a bit now to see if i can figure it out.

#facepalm...this did get fixed (it helps to check the latest dev).

Here's an add-on patch that *just* adds the request in #30...

Was having issues getting my own patch to work predictably.

I've updated it and this version should work now.

@jwilson - Next time, do not reopen a previous fixed & committed issue. Instead open a new issue that references the previous one. The patch you created does not include the changes from the previous patch. There should be only 1 patch per issue. This makes it easier to track, apply and test.

I have created a new issue. #1786604: Add missing admin paths. Please create a new patch for that issue (I would but then I would be stealing your credit). If you do not like the name and/or description of it, change that too.

Sorry 'bout that iStryker. Normally I would have done as you say in a new issue... but i originally thought this issue was closed by accident. After I realized it was actually fixed, it was just a gut-reaction to try to correct my stupid patch with one that worked. I'll try to do better next time, and follow the proper workflow (that i already know, of course ;).

Do the previous comments from #51 and #52 mean that this is actually fixed? Just trying to follow this issue. Thanks!

Sure it's fixed and it works..
The testbot re-opened it due to the patches posted 3 years ago.

Hi All, sorry i'm a newbie here. Does this Diff-like enhancement work in the currently published 7x-1.4? or do i have to use the dev version and then apply the patch?

@mtiminer Its in the latest release, no need to apply patches yourself.

It seems like only the title and body are diffed... is there support for the comparison of field values too?

@antonio.estevez : I have have just tested : yes it supports the comparison of field values too.