-
Notifications
You must be signed in to change notification settings - Fork 823
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Change to use injector for file upload fields in framework #6636
Change to use injector for file upload fields in framework #6636
Conversation
The CMS behat tests are failing - I guess this is related? |
CMS tests need to be fixed separately. I'll come up with a patch. What we want is an annotation on cms behat fixtures that disables certain tests when run with asset-admin installed, and then focus those tests (e.g. on upload field) for running in isolation. |
E.g.
|
156dfdb
to
dac0ea1
Compare
If @sminnee can approve this, I've opted to remove this feature from the default insert link dialog. The issue is that react components don't work within any jquery-ui dialog due to the way that events are blocked by jquery UI (in a way that cannot be fixed without modifying jquery-ui directly). The affected CMS tests are removed with silverstripe/silverstripe-cms#1740 |
5a865b7
to
a6c51f7
Compare
1f63977
to
84a1386
Compare
File media dialog is now removed; asset-admin module adds it back in. See silverstripe/silverstripe-asset-admin#387 Note that the CMS test removes the insert-media test fixtures, as these are now both implemented and tested via asset-admin. |
Added fix for behat silverstripe/silverstripe-behat-extension#145 |
* @returns Name/value array containing information about the plugin. | ||
* @type Array | ||
*/ | ||
getInfo() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This property is unused and inaccessible, we could remove this
* @returns Name/value array containing information about the plugin. | ||
* @type Array | ||
*/ | ||
getInfo() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is also unused and inaccessible, could remove it
webpack.config.js
Outdated
@@ -45,7 +45,8 @@ const config = [ | |||
leaktools: `${PATHS.ADMIN_JS_SRC}/legacy/leaktools.js`, | |||
MemberImportForm: `${PATHS.ADMIN_JS_SRC}/legacy/MemberImportForm.js`, | |||
UploadField_select: `${PATHS.ADMIN_JS_SRC}/legacy/UploadField_select.js`, | |||
TinyMCE_SSPlugin: `${PATHS.ADMIN_JS_SRC}/legacy/TinyMCE_SSPlugin.js`, | |||
TinyMCE_ssmedia: `${PATHS.ADMIN_JS_SRC}/legacy/TinyMCE_ssmedia.js`, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we could move this to the asset-admin repo instead right?
Change UploadField to abstract placeholder FileHandleField for non-modal fields
API Split ssplugin into ssmedia and sslink plugins
84a1386
to
b3fc11e
Compare
Feedback addressed; moved the plugin to asset-admin module. |
@tractorcow 's changes to my pull request look good, I think this is ready for merging |
Created a FieldHandleField interface to use in place of UploadField (which had been pushed to a dependency), and use FileField by default in framework.
Requires: