tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-07-02 17:39:25 +02:00
Code Issues Projects Releases Wiki Activity
1,867 Commits 34 Branches 160 Tags 14 MiB
79e1fb8598
Commit Graph

852 Commits

Author SHA1 Message Date
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
Jose Pereira
4ebcfccf44 FIX: Fixes #833 fixes after peer review 2019-01-16 13:50:16 +13:00
Jose Pereira
7406670003 Fix: Fixes after peer review for #833 2019-01-16 12:24:28 +13:00
Jose Pereira
2ac6ae6a47 FIX: Fixes #833 added validation for minimum and maximum length 2019-01-16 11:15:53 +13:00
Luke Amos
490d05a3e8 FIX: Fixes #814 Changed code referencing email template. 2019-01-16 11:02:04 +13:00
Sacha Judd
2682abea73 NEW Add font-icon for site tree userform page 2019-01-14 13:39:27 +13:00
Robbie Averill
dd5dbe3123 Merge branch '5.2' into 5.3 2019-01-10 12:26:32 +01:00
Robbie Averill
2fd1c1b504 Merge branch '5.1' into 5.2 
# Conflicts:
 #	.travis.yml
 2019-01-10 12:26:18 +01:00
Robbie Averill
7a9ca8fcfd Merge branch '5.0' into 5.1 2019-01-10 12:25:40 +01:00
Nicolaas
96be46a6ac FIX Fixing escape error in required identifier 2019-01-10 12:13:13 +01:00
Scott Hutchinson
5cce7cb519 FIX app email templates not resolving correctly 2018-11-18 14:08:53 +13:00
Robbie Averill
b9a8571352 Merge branch '5.2' into 5.3 2018-11-07 16:45:17 +02:00
David Toews
5271f14998 Allows placeholder value of '0' 2018-10-01 16:20:33 -06:00
Robbie Averill
3bc2b45170 Merge branch '5.2' 2018-09-22 13:54:33 +02:00
Indy Griffiths
2b4451cdac FIX DefaultToToday date format 
Fixes incorrectly using the minute (m) instead of the month (M) and switches to showing an 2018-09-21 format value
 2018-09-22 13:43:00 +02:00
Robbie Averill
6176cf63b8 Merge branch '5.1' into 5.2 2018-09-22 13:42:11 +02:00
Robbie Averill
0ac33336bd FIX Do not remap polymorphic class names to UserDefinedForm if they are already an instance of it 2018-09-07 12:50:34 +02:00
Robbie Averill
c88d6b1566 FIX Recipient email content previews now when when userforms is used in a trait context 2018-09-07 10:45:11 +02:00
Robbie Averill
f734c2f033 FIX Do not override core translation for 'field is required' 2018-09-03 13:37:21 +02:00
Dylan Wagstaff
76540d8ffc
Merge pull request #799 from creative-commoners/pulls/5.2/double-escaped-html 
FIX Submitted form field values are no longer double escaped in the CMS
 2018-08-27 12:42:11 +12:00
Robbie Averill
beb37ff3f0 Merge branch '5.2' 2018-08-24 08:48:48 +12:00
Robbie Averill
04cdac2229
Merge pull request #736 from creative-commoners/pulls/5.0/Postgre 
Test against PgSQL also
 2018-08-21 15:17:56 +12:00
Robbie Averill
cc3ea728e4 FIX Postgres compatibility in requireDefaultRecords database queries 2018-08-21 15:04:51 +12:00
Robbie Averill
ab402b117c FIX Submitted form field values are no longer double escaped in the CMS 2018-08-15 18:22:36 +12:00
Robbie Averill
075985d9c9 Add translation to "Submitter" field label 2018-08-15 16:42:44 +12:00
Robbie Averill
ba9bbfaed5 FIX Remove divider line and add margin underneath Submissions GridField 2018-08-15 16:39:44 +12:00
Daniel Hensby
dc226cf8ba
Merge pull request #793 from stephenmcm/feat-disableShortcode 
Optional disable $UserDefinedForm
 2018-07-11 22:54:58 +01:00
Stephen McMahon
01520c22bd Fix(shortcode) re-order if block check $UserDefinedForm in $this->Content. Rename config value to be clearer 2018-07-09 15:20:30 +10:00
Stephen McMahon
a3a2c3d286 Fix(UserDefinedFormController) change return type of index() when not using shortcode 2018-07-06 09:27:28 +10:00
Stephen McMahon
94192f4b66 Add(config) create disable_form_content_interpolation option for ignoring $UserDefinedForm in $this->Content 2018-07-05 16:10:43 +10:00
Nivanka Fonseka
bbe21fd5a0 fixed PHP lint errors 2018-06-06 08:16:53 +05:30
Nivanka Fonseka
68a377b3ba updated the CSS, and fixed the colspan over the filters 2018-06-05 11:04:23 +05:30
Nivanka Fonseka
db7a79626d Added the missing lang strings, checked for the status before setting up default values, and updated the Date formats 2018-06-04 12:38:44 +05:30
Robbie Averill
8bfab5c847 Merge branch '5.1' 2018-05-30 11:10:37 +12:00
Robbie Averill
491329044b FIX Add extension to remap polymorphic relationship classes for Parent and Form fields 2018-05-18 13:41:02 +12:00
Daniel Hensby
bf086806dc
Merge branch '5.1' 2018-05-09 14:06:12 +01:00
Daniel Hensby
8809d516c4
Merge branch '5.0' into 5.1 2018-05-09 14:03:34 +01:00
Daniel Hensby
e4871b880c
Merge branch '4.5' into 5.0 2018-05-09 14:01:17 +01:00
Jake Bentvelzen
07ca22e729 fix(SubmittedFormField): Fix bug where FormattedValue isn't cast to HTMLFragment, which causes <br/> to appear in Email templates. 2018-05-09 16:31:40 +10:00
Raissa North
8f363d6b60 FIX Remove unnecessary translation of parameterised field value 2018-05-09 17:43:08 +12:00
Chen Shenghan
b205ca952a NEW default value for Country Dropdown (add i18n to the new fields) 2018-05-02 13:57:47 +12:00
Chen Shenghan
8870833318 NEW empty default value for Country Dropdown 2018-05-01 16:07:03 +12:00
Chen Shenghan
4d89705fe6 NEW default value for Country Dropdown 2018-04-30 22:20:28 +12:00
Dylan Wagstaff
569b0a7627 FIX use the same translation variable key as core (#755) 
This way when this translation string overrides the core one, the core
triggered translations will still continue working.
 2018-03-29 09:29:15 +13:00
Robbie Averill
453a35e114
FIX Ensure duplicated multiple option field is written (has an ID) before duplicating options 2018-03-27 10:34:42 +01:00
Robbie Averill
3e71cf7840
Add tests for duplicating multiple option fields, which should duplicate the options too 2018-03-27 10:34:41 +01:00
Robbie Averill
7cbffd8c84 FIX Use a userforms template for the member list field, fixes broken display rules 2018-03-26 11:33:25 +13:00
Dylan Wagstaff
0a9f3f4365
Merge pull request #754 from creative-commoners/pulls/5.0/allow-empty-field-titles 
FIX Allow editable form fields to have nullable titles rather than fallback to Name
 2018-03-26 11:05:06 +13:00
Robbie Averill
5cce5f5a17 FIX Allow editable form fields to have nullable titles rather than fallback to Name 2018-03-23 16:25:06 +13:00
Robbie Averill
f7ffb706ce FIX Use userforms template for member list field, fixes display rule issue 2018-03-23 14:11:39 +13:00
Robbie Averill
86b098ccf5 FIX Disable versioned GridField extensions - it conflicts with UserFormRecipientItemRequest 2018-03-23 11:10:13 +13:00
Robbie Averill
92a2229249 FIX Correctly return the max file size in MB 2018-03-22 16:51:03 +13:00
Robbie Averill
100be38ab1 API Remove use of getEscapedTitle() and deprecated for future removal. Use $Title directly instead. 2018-03-22 09:24:55 +13:00
Dylan Wagstaff
5b68e7bb58
Merge pull request #739 from creative-commoners/pulls/5.0/bootstrap-alert 
Use bootstrap alert instead of old .message.notice
 2018-03-21 12:18:06 +13:00
Robbie Averill
029a69b937 FIX Do not convert right title to XML, templates escape values by default now 2018-03-21 11:57:30 +13:00
Robbie Averill
df1d428df8 Use bootstrap alert instead of old .message.notice 2018-03-21 10:49:13 +13:00
Robbie Averill
d19914044a FIX getFormParent does not automatically look up arbitrary test stubs, remove theme dependency 2018-03-19 16:00:57 +13:00
Dylan Wagstaff
48bf46215e FIX stop form items double duplicating (#728) 
When calling `duplicate` on a form, a form field, or suchlike, the results
would be that all related items to the thing being duplicated (such as
fields for a form, or options to an editabledropdown) would be duplicated
_twice_; ie. where a form had two fields, it's new duplicate would have
four (each one occurring twice). We have stopped this in a backwards
compatible way - that is the bug was introduced with core 4.1, and this
change leaves the userforms module compatible with 4.0.
 2018-03-05 14:31:33 +13:00
Andrew Aitken-Fincham
e2066a55b3 missing 'not', add alert-warning for unsaved form 2018-02-20 14:44:31 +00:00
Andrew Aitken-Fincham
bc5c6221f0 refactor how getCMSFields is built to handle no parent form 2018-02-20 11:45:45 +00:00
Dylan Wagstaff
20570ef108
Merge pull request #717 from creative-commoners/pulls/5.0/better_email_recipient_logic 
adds logic for presence of email recipient fields
 2018-02-15 10:41:27 +13:00
Andrew Aitken-Fincham
201282874f revert UDF has_one to DO has_one 2018-02-14 15:02:27 +00:00
Andrew Aitken-Fincham
0f6efea12a add proper fallbacks to cover tests 2018-02-14 11:30:35 +00:00
Andrew Aitken-Fincham
8c34519644 adds logic for presence of email recipient fields 2018-02-13 16:24:53 +00:00
Andrew Aitken-Fincham
579028982c fall back to CMSMain rather than LeftAndMain to getFormParent correctly 2018-02-13 14:41:38 +00:00
Dylan Wagstaff
46460c0e7c FIX Enhance JS for multiple userform instances (#715) 
After testing it seems that having multiple user defined forms on a page
has already been added as a feature. However various load time dynamically
generated javascript segments had not been adapted to suit. Now they
have.

Also fixed a variable that no longer exists in the external requirements
from preventing a webpack build.
 2018-02-12 16:56:36 +13:00
Martin D
eafe6609e1
jquery version update 2018-02-08 15:48:51 -05:00
Robbie Averill
fa249dd09f Merge branch '4' 2018-02-05 12:10:50 +13:00
Scott Hutchinson
96cde0f04c FIX: Ensure display rules work correctly for EditableFormHeading (#712) 2018-02-05 12:08:24 +13:00
Robbie Averill
7339c1c498 FIX Update display rules not enabled warning message to be full width 2018-02-02 12:58:19 +13:00
Raissa North
77c47a38fa FIX Fix support address list in email address fields (#707) 2018-01-29 09:56:44 +13:00
Dylan Wagstaff
9a09873e7d
Merge pull request #704 from creative-commoners/pulls/5.0/fix-email-template-data 
FIX Submitted form field data is rendered correctly in recipient email templates
 2018-01-26 09:39:22 +13:00
Martin D
ad7b2c4ff2 Update UserDefinedFormController.php (#705) 
Added $request argument to index method
 2018-01-26 09:31:06 +13:00
Robbie Averill
e1a7030306 FIX Submitted form field data is rendered correctly in recipient email templates 
Also remove some deprecated code from UserDefinedFormControllerTest and allow
simple or starter theme to be used in the test.
 2018-01-25 16:17:28 +13:00
Robbie Averill
515f1923ba FIX Update email attachment API for recipients and improve if statement readability 2018-01-25 11:24:36 +13:00
Robbie Averill
5695c9585a FIX Email templates for for submissions display correctly in preview 2018-01-24 15:17:03 +13:00
Robbie Averill
262510a450 FIX Cast template values as array, include list in CMS fields for recipients 2017-12-04 23:45:52 +13:00
Will Rossiter
e82dc5f121 Update default email_template_directory 
Also if the overridded directory is empty - don’t display the template dropdown as this will cause a validation error preventing the user from saving the page.
 2017-12-04 23:27:12 +13:00
Dylan Wagstaff
7f208ee927 FIX javascript errors enacting default functionality 
Mostly to do with translations, however the errors meant the front end
forms largely didn't work at all. Some of this was to do with the scoping
of `this` in es6 arrow functions, compared to the legacy code with entwine
that uses the fuller `function` definition. Reinstate missing dependency
for translations to function too.
 2017-11-20 15:16:03 +13:00
Robbie Averill
ccf8f86bf8 FIX Update getIcon resource resolution methods 2017-11-03 11:12:55 +13:00
Robbie Averill
1643b1a689 FIX Explicitly get the Fields() method from controller's data record 2017-11-01 11:43:53 +13:00
Robbie Averill
d11e568cdf FIX Polymorphic has_one needs parent class name set 2017-10-26 15:40:48 +13:00
Robbie Averill
317cfdeb6f FIX Remove incorrect upgrader translation operations and mark to be skipped in future 2017-10-26 10:00:02 +13:00
Will Rossiter
9455cf51f5 Correct icon path 2017-10-21 13:16:13 +13:00
Robbie Averill
9c15c74f7b Convert to vendor module, remove secure assets suggestion 2017-10-18 22:18:46 +13:00
Will Rossiter
86cd7f9511 Fix tests 2017-10-18 21:36:31 +13:00
Will Rossiter
3ac2ac55b5 Fallback permission checking 2017-10-16 14:24:51 +13:00
Will Rossiter
efae9a293e Fallback to parent permissions 2017-10-16 10:13:14 +13:00