similar issue #1107384: wrong instance definition in node.module

CommentFileSizeAuthor
#8 1111288-fix-D8.patch3.8 KByched
#6 1111288-fix-D7.patch109 bytesyched
#6 1111288-fix-D8.patch3.7 KByched
#3 field_ui_test_2.patch715 bytesdroplet
field_ui_test.patch1.67 KBdroplet

Comments

Status: Needs review » Needs work

The last submitted patch, field_ui_test.patch, failed testing.

yched’s picture

yched commented

The 3rd hunk is correct, but for the other two, the current code is correct - this is about building form values for the 'add new field' line in Field UI's 'manage fields' form. In this form, the input for the widget is actually called 'widget_type'.

droplet’s picture

droplet commented
Version: 7.x-dev » 8.x-dev
Status: Needs work » Needs review
Issue tags: +Needs backport to D7
StatusFileSize
new field_ui_test_2.patch715 bytes

ahh. I see what happen. :)

yched’s picture

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

thanks !

dries’s picture

dries commented
Status: Reviewed & tested by the community » Fixed

Committed to 7.x and 8.x. Thanks.

yched’s picture

yched commented
StatusFileSize
new 1111288-fix-D8.patch3.7 KB
new 1111288-fix-D7.patch109 bytes

Dries, the D8 commit also reverted #1097100: Remove all 7xxx update functions and tests (D6 to D7 upgrade path) for the following files :
modules/field/field.install
modules/field/modules/field_sql_storage/field_sql_storage.install
modules/node/node.install
See http://drupalcode.org/project/drupal.git/commitdiff/aeb0651fb650ad284c20...

Also, patch #3 changed the field_ui.test file from 644 to 755 (affects both D7 and D8)

Attached patches fix back D7 and D8.

yched’s picture

yched commented
Status: Fixed » Reviewed & tested by the community

should be RTBC.

yched’s picture

yched commented
StatusFileSize
new 1111288-fix-D8.patch3.8 KB

Actually, it seems forum.install D8 has also been moved to 755 in a recent commit.
New patch for D8. Patch #6 is still valid for D7.

dries’s picture

dries commented
Status: Reviewed & tested by the community » Fixed

Ah, thanks. Committed to 8.x.

droplet’s picture

droplet commented
Status: Fixed » Reviewed & tested by the community

sorry. seems them are my patches.

I set it prevent it happen again

git config core.filemode false
dries’s picture

dries commented
Status: Reviewed & tested by the community » Fixed

I don't understand #10. Did you mean to mark this RTBC again?

droplet’s picture

droplet commented

@11, my status changes is wrong (when I replied this comment I do not see your #9 reply)

yched’s picture

yched commented
Version: 8.x-dev » 7.x-dev
Status: Fixed » Reviewed & tested by the community

@Dries : D7 needs to be fixed too :-) (field_ui.test 755 --> 644). Patch is in #6.

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented

Wow, bizarre. I had no idea you could do chmod changes in patch form.

However, I tried to apply this and get:

webchicks-MacBook-Pro:core webchick$ git apply 1111288-fix-D7.patch 
warning: modules/field_ui/field_ui.test has type 100644, expected 100755
webchicks-MacBook-Pro:core webchick$ git diff
(no output)

So is #6 still necessary?

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented
Status: Reviewed & tested by the community » Fixed

Well it helps when I'm on the right branch, doesn't it? (EEEK!) Heh.

Committed to 7.x. :)

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented
Issue tags: -Needs backport to D7

.

Status: Fixed » Closed (fixed)

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