The following adds field support for the new Diff 7.x-3.x branch.

CommentFileSizeAuthor
#10 diff-er.jpg46.03 KBamitaibu
entityreference-diff-7.x-3.x-support.patch2.76 KBalan d.

Comments

mitchell’s picture

mitchell commented

I tested this patch, and everything works well. Thanks, Alan D.

mitchell’s picture

mitchell commented
Issue tags: +Diff integration

Tagging.

twardnw’s picture

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

This checks out for me. Changed a entity reference field and it is marking nicely in diff.

adamdicarlo’s picture

adamdicarlo commented
Priority: Normal » Critical
Issue tags: +drupal.org D7, +porting

Tagging and elevating to critical because the drupal.org upgrade depends on this, and the functionally complete deadline is the end of this month.

adamdicarlo’s picture

adamdicarlo commented

I tested this on a local sandbox site and it works great. +1 RTBC.

amitaibu’s picture

amitaibu
Primary language Hebrew
Location Israel
commented

Shouldn't we show a link to the entity, instead of just the title?

alan d.’s picture

alan d. commented

The link may be rendered as escaped HTML and would look untidy. Terms, files, etc, all just have titles and optional additional extras like the entity ID.

amitaibu’s picture

amitaibu
Primary language Hebrew
Location Israel
commented

> The link may be rendered as escaped HTML and would look untidy

I mean you can use entity_label() and entity_uri(), no?

alan d.’s picture

alan d. commented

Sorry, I'm not following. This already uses entity_label().

+      $t_args['!diff_entity_label'] = entity_label($entity_type, $item['entity']);

If you supply a link to the Diff engine, it is escaped to this

<a href="path/to/entity">entity label</a>

i.e. Rendered like this
<a href="path/to/entity">entity label</a>

amitaibu’s picture

amitaibu
Primary language Hebrew
Location Israel
commented
StatusFileSize
new diff-er.jpg46.03 KB

Here's what I mean:

diff-er.jpg

adamdicarlo’s picture

adamdicarlo commented

Nope - the DiffEngine actually escapes that output. We *can't* make it a clickable link. It would read as HTML code, like Alan said in #9.

mitchell’s picture

mitchell commented

There's an issue to encode html entities: #458672: Use real HTML-Diff algorithm in Drupal Diff module.

amitaibu’s picture

amitaibu
Primary language Hebrew
Location Israel
commented
Status: Reviewed & tested by the community » Fixed

Committed.

I think it would be nice to have a link, once Diff supports it.

hass’s picture

hass commented

Will there be a RC6 or final soon? :-)

Automatically closed -- issue fixed for 2 weeks with no activity.