We probably want a way to let admins control if conflict.module "hijacks" the node edit form for each content type. Perhaps inject a node type setting into the "Submission form settings" vertical tab? Seems silly to add a whole new vtab for this, although I'm not sure people would know to look in "Submission form settings" since this is really about "Edit form settings" (which is mostly the same, but subtly different). Maybe just in "Publishing options", although again, that's not exactly the right fit, either...

CommentFileSizeAuthor
#2 1599484_0.patch1.29 KBdfletcher

Comments

dww’s picture

Version: » 7.x-1.x-dev
Category: feature » task
Priority: Normal » Major
Issue tags: +4hr

Yeah, we think we're going to need this for deployment on d.o. Guessing about 1/2 day to get the UI working and make the rest of conflict.module honor this setting.

dfletcher’s picture

StatusFileSize
new1.29 KB

Patch attached. I went ahead and put the checkbox under "Submission form settings".

dww’s picture

Status: Active » Needs review

Visually looks good to me, but I haven't tested it yet. Seems like it should work fine. ;) I'll commit once I actually test it. Or someone else can test and RTBC.

Thanks!
-Derek

dfletcher’s picture

Status: Needs review » Active

Oh and once that patch gets applied someone should probably put a note on the project page that it now requires configuration to activate.

drumm’s picture

Status: Active » Needs review

Correcting the status. I'll take #1831966: Enable and properly configure conflict.module during upgrade and review this.

drumm’s picture

Status: Needs review » Reviewed & tested by the community

Looks good.

dww’s picture

Status: Reviewed & tested by the community » Fixed

Pushed to 7.x-1.x.

Thanks!
-Derek

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