In preparation of letting imagefield use the "filefield API", this patch renames 'remove' to 'delete' (also in the user visible strings). The plan is to unify the structure of the $file array, which I intend to do by using $file['delete'] instead of $file['remove'] in filefield, and instead of $file['flags']['delete'] in imagefield. When both are done, $file arrays can be passed between filefield and imagefield functions without any doubts that it might not work.

Applies to plain HEAD.

CommentFileSizeAuthor
#4 filefield-delete-not-remove-try3.patch3.22 KBjpetso
#3 filefield-delete-not-remove-try2.patch3.25 KBjpetso
filefield-delete-not-remove.patch3.05 KBjpetso

Comments

jpetso’s picture

jpetso commented

Ah right, the reasons why I prefer 'delete' over 'remove':

  • Not only imagefield, but also the upload module uses this nomenclature.
  • Typically, checking the Remove box really deletes the file, so 'delete' is semantically correct.
drewish’s picture

drewish commented

+1, we should bring the verbiage into line with core.

jpetso’s picture

jpetso commented
Status: Needs review » Reviewed & tested by the community
StatusFileSize
new filefield-delete-not-remove-try2.patch3.25 KB

Rerolled for current HEAD.

jpetso’s picture

jpetso commented
StatusFileSize
new filefield-delete-not-remove-try3.patch3.22 KB

Er, it's still $node_field, not $items. Don't know where I got that from. Also, improve the deletion validation text so that it's more future proof.

jpetso’s picture

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

Committed to filefield HEAD. Yay, makes the 'required' setting actually work.

Anonymous’s picture

(not verified) commented
Status: Fixed » Closed (fixed)