Commit Graph

839 Commits

Author SHA1 Message Date
Daniel Hensby bc5689b55a
Merge pull request #1056 from purplespider/patch-1
Stops reply-to address being set to empty, if reply-to field value is empty
2021-05-14 21:21:52 +01:00
Steve Boyd 4d2ca74ea5 Merge branch '5.8' into 5 2021-05-03 15:34:18 +12:00
Andre Kiste 6b94f9b791
Merge pull request #1040 from creative-commoners/pulls/5.8/email-preview
FIX Show correct fields in email preview
2021-05-03 15:25:18 +12:00
Maxime Rainville a917fbe2ea Merge branch '5.8' into 5 2021-04-14 11:30:53 +12:00
Steve Boyd 52e678c6e7 FIX Include merge fields in plain text emails 2021-04-13 19:05:29 +12:00
James Cocker b01d296c42
Avoids reply to address being set to empty, if reply to field value is empty 2021-04-12 21:27:25 +01:00
Luke Fromhold 78f3e68a25 Fix directory for UsedOnTableExtension namespace, to be psr-4 compliant. New dir rather than namespace to prevent backwards-incompat. 2021-04-02 16:04:17 +11:00
Will Rossiter e925aa1979
FIX Uploaded files not appearing in emails
As files uploaded into `DRAFT` mode ensure that these are still displayed in the submitted form.
2021-03-22 21:30:14 +13:00
Bauke Zwaan fad372d4ba Only add attachments when HideFormData-setting is not set for this recipient 2021-03-12 09:30:11 +01:00
Steve Boyd 79259b593a FIX Visibility of subsequent form fields and step buttons 2021-03-10 16:06:01 +13:00
Steve Boyd 9eaee41282 ENH Use yarn and webpack to upgrade jquery 2021-03-04 17:05:55 +13:00
Chris Penny 72a213790e
MNT Update docblocks and import statements (#1044) 2021-02-26 16:13:23 +13:00
Michal Kleiner 0abda42179 Use correct directory separator on Windows when selecting email templates 2021-02-10 11:52:15 +13:00
Steve Boyd 8801790b66 FIX Show correct fields in email preview
Co-authored-by: Michael Caruana <mikeyc7m@users.noreply.github.com>
2021-01-17 22:55:10 +13:00
Steve Boyd ce2fe31bdd Merge branch '5.7' into 5.8 2021-01-17 15:58:55 +13:00
Dylan Wagstaff c0a30f1b6a
FIX unrequire fields when they become dataless (#1016)
* FIX unrequire fields when they become dataless

When fields that collect input data are changed in configuration via the
CMS to become fields that no longer collect input data (e.g. TextField
-> HTML Block), submitting the resulting form results in a fatal error,
server 500 response, etc. due to trying to check if a field without data
(ever) has data in it.

To circumvent this we can set the required state to false if the field
is being converted to one that does not collect data (which FormField
API conveniently provides a check for).

* Move parent::onBeforeWrite() to top of function

Co-authored-by: Steve Boyd <emteknetnz@gmail.com>
2021-01-17 15:55:47 +13:00
Dylan Wagstaff a42729679b
FIX account for owner class while removing orphans (#1018)
* FIX account for owner class while removing orphans
* Explicitly set $page and $block ID's in test fixture

Co-authored-by: Steve Boyd <emteknetnz@gmail.com>
2021-01-17 15:29:33 +13:00
Dylan Wagstaff e7f51d227a
ENH Move jQuery include away from CDN (#1019)
- Move jQuery include away from CDN
2021-01-17 14:37:01 +13:00
Michal Kleiner 66bbe44972
FIX Add missing dots in translation string references 2020-12-02 10:01:50 +13:00
Steve Boyd f81360e737 Merge branch '5.7' into 5 2020-11-12 15:18:00 +13:00
Steve Boyd ead1827aa1 Merge branch '5.6' into 5.7 2020-11-12 15:17:31 +13:00
Steve Boyd 2a47b1821e NEW Extension to link file submissions to userform on the used on table 2020-11-04 11:47:50 +13:00
Dylan Wagstaff 0ce94b75f5 FIX correctly calculate MaxFileSizeMB
The inputted value is intended to represent megabytes, but is only
multiplied by 1024 - meaning it'd represent kilobytes. This is then used
to compare with the PHP setting number, which is bytes in the range of
megabytes. Kilobytes are always under megabytes, meaning size
comparisons elsewhere in the code are always true.
We should ensure the calculation for validation is correct.
2020-11-01 11:31:23 +13:00
Maxime Rainville d2bf27c847
MNT Fix broken merged up (#1013) 2020-10-22 15:47:17 +13:00
Maxime Rainville 4eb0fe25b9 Merge branch '5.5' into 5.6 2020-10-22 10:22:19 +13:00
Steve Boyd 42df67fe76 Merge branch '5.6' into 5.7 2020-09-22 10:29:09 +12:00
Steve Boyd 273cb1e46b Merge branch '5.6' into 5 2020-09-22 10:27:58 +12:00
Maxime Rainville 24e770e00d BUG Remove old boostrap 3 CSS class 2020-09-16 11:38:33 +12:00
Steve Boyd f09691f9cb FIX Vertically align confirm folder icon 2020-09-15 15:24:16 +12:00
Steve Boyd dd9618e768 Merge branch '5.6' into 5 2020-09-03 09:35:15 +12:00
Steve Boyd 8d09cb171f FIX Use translation string that belongs to UserDefinedFormAdmin
This is to for the benefit of cow translate which did not like the use of _t(CMSMain::class
2020-08-18 12:20:10 +12:00
Steve Boyd 81fcd669a2 FIX Show custom validation message for checkbox and radio groups 2020-07-21 17:30:55 +12:00
Steve Boyd 46c6d93d9c Merge branch '5.6' into 5 2020-07-17 23:24:37 +12:00
Steve Boyd 59cd87d842 FIX Trim recipient email addresses before write 2020-07-14 16:41:36 +12:00
Maxime Rainville 27228d12af [CVE-2020-9309] Require MimeUploadValidator on userformis' File Upload field 2020-07-13 11:33:46 +12:00
3Dgoo 6ca8ce2596
FIX Fixing plain email blank file field value (#940)
* Fixing plain email blank file field value
2020-07-01 09:00:31 +12:00
Maxime Rainville 25978d3c58 Clean up tests 2020-06-12 00:55:12 +12:00
Maxime Rainville df120133ab Move confirm folder logic to a dedicated controller 2020-06-11 19:53:46 +12:00
Maxime Rainville dc5ce0000a BUG Fix confirm upload form modal on Elemental block 2020-06-11 15:17:13 +12:00
Andre Kiste 3b40be3b8f
NEW Add folder confirmation modal when adding a new `EditableFileField` to a userform. (#972) 2020-06-10 16:59:01 +12:00
Garion Herman 14ce51e517
NEW Improve Unrestricted Folder warning, bump core requirement to ^4.6 (#965) 2020-06-09 21:01:09 +12:00
Steve Boyd ed53709631 NEW DB column showing if file is userform upload
- UserFormUpload used by File::isTrackedFormUpload()
2020-05-28 13:14:34 +12:00
Steve Boyd e54a825ea3 Merge branch '5.5' into 5 2020-05-27 13:41:51 +12:00
Steve Boyd c3d990f70f
FIX Create image thumbnails for asset-admin for images uploaded through userforms (#969) 2020-05-27 12:26:14 +12:00
Maxime Rainville 09ea65edc7 Merge branch '5.5' into 5 2020-05-26 15:13:09 +12:00
Maxime Rainville 319fa4734c Merge branch '5.4' into 5.5 2020-05-26 15:11:46 +12:00
Maxime Rainville 133e897ad3 Merge branch '5.4' into 5 2020-05-26 15:06:14 +12:00
Dan Hensby ede2d93363
Linting fixes 2020-05-05 16:30:57 +01:00
Serge Latyntcev 23de5a85c2 [CVE-2020-9280] Task for shifting UserForm uploads into correct folders
A task helper for recovering UserForm uploads targeting incorrectly migrated folders (from Silverstripe CMS 3)
    If your project has not been migrated from Silverstripe CMS 3, you do not need this helper.
    Before running this task make sure you have repaired the migrated folders themselves.
    To do that you have to run the extra migration subtask (`migrate-folders`).

    This task is particularly looking at all UserForm file submissions and checks they are in the same
    folder where the particular version of its EditableFileField has been set up to upload it to.

    If it finds the file has been misplaced, it tries to move it to the correct folder, but only if
    the file has not had any manipulations since the uploading happened (the file Version=1).

    If an affected file has a draft, then only Live version will be moved, but the draft will be preserved as is.

    For more details see CVE-2020-9280
2020-04-15 12:19:23 +12:00
Serge Latyntcev 3bbad20442 [CVE-2020-9280] Task for shifting UserForm uploads into correct folders
A task helper for recovering UserForm uploads targeting incorrectly migrated folders (from Silverstripe CMS 3)
    If your project has not been migrated from Silverstripe CMS 3, you do not need this helper.
    Before running this task make sure you have repaired the migrated folders themselves.
    To do that you have to run the extra migration subtask (`migrate-folders`).

    This task is particularly looking at all UserForm file submissions and checks they are in the same
    folder where the particular version of its EditableFileField has been set up to upload it to.

    If it finds the file has been misplaced, it tries to move it to the correct folder, but only if
    the file has not had any manipulations since the uploading happened (the file Version=1).

    If an affected file has a draft, then only Live version will be moved, but the draft will be preserved as is.

    For more details see CVE-2020-9280
2020-04-14 15:58:23 +12:00
Steve Boyd 52ca4c8de9 Merge branch '5.5' into 5 2020-01-29 12:20:36 +13:00
Garion Herman 4e0f0e903d Update jQuery to 3.4.1 2020-01-24 10:06:59 +13:00
Maxime Rainville e2c05d5a55 Minor linting adjustment. 2020-01-14 12:28:04 +13:00
Maxime Rainville d280c54860 Patch and reorganise some test 2020-01-13 12:15:34 +13:00
Maxime Rainville 8d0a5dd093 Add some missing comments 2020-01-13 12:14:11 +13:00
Maxime Rainville 793f437289 API Mark EditableFormField::EffectiveDisplayRules() for deprecation 2020-01-13 12:12:14 +13:00
Maxime Rainville a0cedaeb38 Move conditionalFieldEnabled to EditableFormField as isDisplayed 2020-01-10 17:36:04 +13:00
Maxime Rainville b53619477c Revert the return type for UserForm::getRequiredFields 2020-01-10 17:34:43 +13:00
Jess Champion 25bfc9eaf5 Required fields can have display rules. Hidden required fields are dynamically excluded from server and client side validation. 2020-01-10 10:41:59 +13:00
Charlie Bergthaler dfeb922818
FIX Add missing import statement for SilverStripe\ORM\ValidationResult in UserDefinedFormController and EditableFileField. 2019-10-07 21:56:22 +13:00
Marco (Valandur) 0348e5dd15 fix(submitted-form): Pass member to parent calls 2019-09-06 15:37:13 +02:00
Marco (Valandur) 696fa1d05e fix(submitted-form): canCreate not checking parent 2019-09-05 12:12:26 +02:00
Bram de Leeuw 8703ace32a validate that a classname had been set 2019-07-15 11:15:30 +02:00
Bram de Leeuw e80795b52d
Add a comment for clarity 2019-07-12 10:48:59 +02:00
Remy Vaartjes d489271197 Disable add action in Submissions detail form 2019-07-08 14:49:00 +02:00
Remy Vaartjes f682e74f44 Enable 4.4 better button functionality 2019-07-08 14:26:58 +02:00
Guy Marriott d7c76ecf80
FIX Preview email link now handles cases where it's loaded in the browser, requested via AJAX and used in a trait or a page context (#887)
FIX Preview email link now handles cases where it's loaded in the browser, requested via AJAX and used in a trait or a page context
2019-05-27 20:01:56 +12:00
Robbie Averill 483fbc8499 FIX Preview email link now handles cases where it's loaded in the browser, requested via AJAX and used in a trait or a page context 2019-05-17 15:51:11 +12:00
Robbie Averill d0e937a588 FIX Allowed text length fields now align correctly with each other 2019-05-17 15:12:57 +12:00
Robbie Averill d141c83e0a Import missing PHPDoc doc blocks, switch intval() for (int) casting 2019-05-17 14:56:00 +12:00
Garion Herman 2f0aea847a Add presence validation for EmailRecipient recipient, add error handling 2019-05-03 16:46:32 +12:00
Robbie Averill b3dc50d253 Merge branch '5.3' into 5.4 2019-05-03 10:16:58 +12:00
Robbie Averill c63a06cb91 Merge branch '5.2' into 5.3 2019-05-03 10:16:47 +12:00
Robbie Averill 44d6766440 Merge branch '5.1' into 5.2 2019-05-03 10:16:34 +12:00
Robbie Averill 334dca59ab Merge branch '5.0' into 5.1 2019-05-03 10:16:21 +12:00
Guy Marriott 9d311ca02b
FIX Support new arguments for better buttons support 2019-05-02 14:48:19 +12:00
Robbie Averill 1ac3f5a97c Merge branch '5.3' into 5.4 2019-05-02 11:02:23 +12:00
Robbie Averill 5f3014ac54 Merge branch '5.2' into 5.3 2019-05-02 11:02:12 +12:00
Robbie Averill c7cd970024 Merge branch '5.1' into 5.2 2019-05-02 11:01:59 +12:00
Robbie Averill 79e343c1d9 Merge branch '5.0' into 5.1 2019-05-02 11:01:50 +12:00
Joe Harvey 2cd0602886 Remove unnecessary isset() check 2019-05-01 09:16:22 +12:00
Joe Harvey 418017494f Prevent 'undefined index' warnings when optional country dropdown fields are left empty 2019-05-01 09:16:22 +12:00
Robbie Averill a4cd982637 Merge branch '5.3' 2019-03-26 14:46:22 +13:00
Robbie Averill b1a04d6563
Merge pull request #871 from quantum-dragons/pulls/fix-form-vallidation-exception-message
Fix exception error message fails when error in upload file.
2019-03-26 14:44:57 +13:00
Ishan Jayamanne 3615f416e3 Fix exception error message fails when error in upload file. 2019-03-26 01:28:36 +00:00
Robbie Averill bf142eb6ef FIX Display rules for page breaks/editable form steps now works again
This was previously broken in a regression from https://github.com/silverstripe/silverstripe-userforms/pull/575
where the fields themselves could still be toggled, but the jQuery event dispatches for the form steps
were removed. This pull request re-introduces those jQuery event triggers when hiding and showing
editable form fields via display rules.
2019-03-25 15:09:38 +13:00
Robbie Averill e36de481cc Merge branch '5.3' 2019-03-19 12:05:54 +13:00
pjayme b49d38ff0f updated canCreate function to check for Parent object 2019-03-13 10:18:41 +13:00
pjayme d8a8ddc61d re-added can* methods for EditableOption field 2019-03-13 09:20:51 +13:00
3Dgoo a8e21b193f
Allow form fields in email subjects
Allows form fields in email subjects using merge field the same as body insertion functionality.
2019-01-28 09:06:12 +10:30
Alexandre Saelens 6acee54596 Avoid calling getter twice 2019-01-17 12:47:09 +13:00
Alexandre Saelens 2e60a79e40 Check recipient alternate from/to fields exists 2019-01-17 12:40:50 +13:00
Robbie Averill 1ad1019e0a
Merge pull request #852 from LukeAmos/issue/814
FIX Fixes #814 Renamed 'SubmittedFormEmailHtml' to 'SubmittedFormEmail'
2019-01-16 22:55:50 +01:00
Luke Amos 1efeeca6db FIX Fixes #814 Renamed 'SubmittedFormEmailHtml' to 'SubmittedFormEmail'
following peer feedback.  Updated respective code and unit test
2019-01-17 10:30:05 +13:00
Robbie Averill b2101c15fc
Merge pull request #851 from LukeAmos/issue/850
FIX Fixes #850 added validation to numerical form fields
2019-01-16 22:12:32 +01:00
Robbie Averill f235c8642c Add unit tests for EditableNumericField::validate() 2019-01-16 21:59:02 +01:00
Luke Amos d917262565 FIX Fixes #850 Considered location following peer feedback 2019-01-17 09:20:31 +13:00
Luke Amos ca06f000a1 FIX Fixes #850 added validation to numerical form fields 2019-01-16 23:32:15 +13:00
Guy Marriott 305cf39b32
Merge pull request #849 from josepereira245/issue/833
FIX: Fixes #833 added validation for minimum and maximum length
2019-01-16 15:57:46 +13:00
Jose Pereira 0fd0b3fc1f FIX: Fixes #833 After peer review. 2019-01-16 15:08:42 +13:00