Commit Graph

592 Commits

Author SHA1 Message Date
Daniel Hensby
a5c8fac64f
Merge branch '4.0' into 4.1 2017-02-03 14:39:36 +00:00
torleif
8c27891600 Fix for #185 and #194 (#539)
* Fix for #185 and #194

* Fix for #185 and #194

* Fix for #185 and #194
2017-01-30 10:24:00 +00:00
Daniel Hensby
2f710d6518 FIX Improve publish performance for formfields (#538)
* FIX Improve publish performance for formfields

* FIX Travis builds broken with external code coverage
2017-01-25 09:35:50 +13:00
Kirk Mayo
ac4c1678a2 Added email address validation to model
Added unit tests for email address validation

Corrected order of params for assertNotContains

EmailRecipient email address validation
2017-01-12 08:51:05 +13:00
Damian Mooyman
b047a1468c BUG Fix issue with UserFormsCheckboxSetField
Fixes #533
2016-12-21 15:09:27 +13:00
Damian Mooyman
1743ed1556
BUG Fix issue with UserFormsCheckboxSetField
Fixes #533
2016-12-14 10:45:42 +13:00
Elliot Goode
d0bf02d25f ENHANCEMENT: Add autocomplete to EditableTextField
* Fixes #526 (autocomplete attributes)

adds ability for text fields to store additional html5 autocomplete
attributes, attributes are per text field and populated from a dropdown
list from the html5 specification. (Credit card and password
autocomplete values omitted as should user defined forms be used to
collect this information?)

* Options moved to config

moved array of auto complete values out to config option as recommended

* Clarify function

updated name, and added description to make more obvious what function
is for normal users

* added translation for field names

along with some localisation for DE/EN/ES/FR/IT/PL/RU languages

* formatting changes and argument removal

formatted array as chopped list, and remove argument that wasn’t
required.

* ADHD kicking in

consistency changes.
2016-12-14 10:12:46 +13:00
torleif
a6229ab22b Fixes #529 2016-12-09 12:01:10 +13:00
torleif
6e567852b7 Fixes #529 2016-12-09 09:15:44 +13:00
Ryan O'Hara
8af5ff93c3 Make sure option gridfield is created before the UpdateCMSFields function so we can override fields in extensions 2016-11-28 16:26:27 +13:00
Damian Mooyman
aa171f8e45 BUG Enable Shortcode parsing for the Content in EditableLiteralField 2016-11-21 12:26:18 +13:00
Eduard Briem
c3ba8f42e1 using forTemplate() instead of (string) casting fixes unit test 2016-11-21 10:48:10 +13:00
Eduard Briem
b1a4b4823f force cast to string $this->dbObject('Content') in EditableLiteralField 2016-11-21 09:20:46 +13:00
Nic Horstmeier
6e10acf6cd ENHANCEMENT setEmptyString option on EditableDropdown
closes #17
2016-11-16 17:04:54 -06:00
Eduard Briem
184a433a15 enable Shortcode parsing using $this->dbObject instead of manually invoking the shortcode parsers 2016-11-07 11:42:55 +13:00
Eduard Briem
d6d61635be Enable Shortcode parsing for the Content in EditableLiteralField to be able to use internal links inside the HTMLEditorfield 2016-11-04 08:41:02 +13:00
Nic Horstmeier
1a5d5eac4b BUGFIX incorrect method name
fixes #513
2016-10-12 23:34:23 -05:00
Daniel Hensby
54e6e9aeb5
Merge branch '4.0' 2016-09-23 17:27:15 +01:00
Daniel Hensby
efcd85fcbe
Merge branch '3.1' into 4.0 2016-09-23 17:24:09 +01:00
Daniel Hensby
eed799dbd9
Merge branch '3.0' into 3.1 2016-09-23 17:21:37 +01:00
Nic Horstmeier
76483188dc BUGFIX EditableFormHeading doesn't properly handle numeric values
fixes #510
2016-09-20 19:26:47 -05:00
Damian Mooyman
7167f3a1c5 Merge pull request #501 from muskie9/enhancement/fileSizeLimit#430
ENHANCEMENT add customisable file upload size limit
2016-08-23 17:36:29 +12:00
Damian Mooyman
c6c609a4c9 Merge remote-tracking branch 'origin/3.1'
# Conflicts:
#	code/forms/UserForm.php
#	code/model/UserDefinedForm.php
#	code/model/editableformfields/EditableFileField.php
#	code/model/editableformfields/EditableOption.php
2016-08-18 10:20:56 +12:00
muskie9
b701b250a3 ENHANCEMENT add customisable file upload size limit 2016-08-11 17:51:47 -05:00
Damian Mooyman
57048fd901 Convert to psr-2 2016-08-09 17:05:22 +12:00
Daniel Hensby
a3d425d443
Merge pull request #269 from mediabeastnz 2016-07-28 14:20:43 +01:00
muskie9
08646ad45e BUGFIX no Sort value applie to EditableOption on write 2016-07-21 01:08:03 -05:00
Damian Mooyman
255ded1542
API Allow risky "to" recipient fields to be configured
Fixes #333
2016-07-21 17:56:30 +12:00
muskie9
14b7c65859 BUGFIX progress bar button text change breaks buttons
fixes #488
2016-07-14 09:29:25 -05:00
Damian Mooyman
931753bbca Merge pull request #478 from SilbinaryWolf/fix-reorderissue
fix(Reorder): Fix bug where 'Content Authors' can no longer re-order form fields due to how GridFieldOrderableRows checks canEdit() permissions.
2016-07-14 12:30:01 +12:00
Jake Bentvelzen
329ad80596 fix(Reorder): Changed $this->ID == 0 to !$this->exists() and added Controller::has_curr() check 2016-07-14 09:41:37 +10:00
Damian Mooyman
e34b87f760 Merge pull request #487 from sekjal/issue477
Set EditableCustomRule.FieldValue to Varchar(255)
2016-07-12 17:10:55 +12:00
Damian Mooyman
446b98b3e8 Merge pull request #454 from micmania1/add-value-to-options
NEW added value to options
2016-07-04 18:18:02 +12:00
Ian Walls
91eb97e37c Set EditableCustomRule:FieldValue to Varchar(255)
Fixes issue #477; without explicitly setting the length here,
the field defaults to 50, making it impossible to match HasValue
on longer field options.
2016-06-22 10:02:38 -04:00
Damian Mooyman
5f31f36a17 BUG Prevent strstr showing warning on array $value
Fixes #481
2016-06-20 09:54:33 +12:00
Daniel Hensby
c2b9342aa2 Merge pull request #476 from tractorcow/pulls/fix-maxlength
BUG Fix issue with maxlength="0"
2016-06-06 12:41:53 +01:00
micmania1
cb605d5633 NEW Added option to allow empty values 2016-05-26 10:15:19 +12:00
micmania1
2eb652f264 NEW added value top options 2016-05-26 10:14:56 +12:00
Jake Bentvelzen
08d173f24a fix(Reorder): Fix bug where 'Content Authors' can no longer re-order form fields due to how GridFieldOrderableRows checks canEdit() permissions.
fix(Reorder): Fix EditableFormField to fallback to current page editing permissions when reordering with GridFieldOrderableRows component.

 fix(Reorder): Check if record exists before calling 'hasExtension' check.
2016-05-24 10:26:54 +10:00
Damian Mooyman
bff2f2370f BUG Fix issue with maxlength="0"
Fixes #367
2016-05-16 18:05:05 +12:00
Damian Mooyman
f029bfcc61 Partial revert of #458
Fix travis configuration
2016-05-16 14:46:13 +12:00
Bram de Leeuw
3f0c04523c added missing semicolons
Added two missing semicolons
2016-05-16 14:45:34 +12:00
assertchris
a92c9ec69d Fixing validation for CheckboxSet field (multiple options selected in a required field) 2016-05-16 08:27:05 +12:00
Damian Mooyman
50b2a5c60d Merge pull request #466 from oetiker/patch-1
By default, form fields should be visible
2016-05-12 20:29:49 +12:00
Arno Poot
f9e6491072 Add empty space before classes (#470)
Before:

field textverplicht-notice nolabel

After:

field text verplicht-notice nolabel
2016-05-09 16:19:55 +01:00
Tobias Oetiker
88509291d3 fixed indentation 2016-04-29 14:15:01 +02:00
Tobias Oetiker
0547a01912 By default, now form fields should be shown
Having to click through 2 levels of property settings to make a new form field visible seems a bit much ... or else I have not found the configuration setting for this.
2016-04-28 11:09:25 +02:00
Damian Mooyman
7307f88c36 Partial revert of #458
Fix travis configuration
2016-04-28 18:18:24 +12:00
Bram de Leeuw
dfc3f2f4be added missing semicolons
Added two missing semicolons
2016-04-26 10:39:45 +02:00
Daniel Hensby
9e32030ad2
Merge branch 'pulls/core-validation' of https://github.com/tractorcow/silverstripe-userforms into tractorcow-pulls/core-validation 2016-04-22 14:43:39 +01:00
SilbinaryWolf
b537e6fe0b API Added ability to extend permissions of SubmittedForm with an extension 2016-04-22 13:33:02 +12:00
Will Rossiter
32ae99112c Merge pull request #458 from dnadesign/master
Added routing for UserDefinedForm_Controller
2016-04-22 12:09:54 +12:00
Damian Mooyman
5349bb7d3b API Use core validation for form submission
Fixes #350 and fixes #404
This change abandons validation via EditableFormField::validateField, as it bypassed too many core validation mechanisms (RequiredFields, etc).
In order to enforce consistency of editable field validation, display rules have been hard-disabled when a field is marked as required.
Since this removes functionality, I have incremented the major version number
2016-04-18 12:04:21 +12:00
Remy Vaartjes
9b5a3c2d67 Make sorting of options possible
Options are not sortable, please implement this change.
2016-04-14 16:40:45 +02:00
rasstislav
4e8e919c42 NEW Allow translation of tab names (#384)
Tab names in the CMS can now be translated
2016-04-08 16:45:10 +01:00
jkRoberts
9922ab36ce Updating getFormField to use upload field if config isset. 2016-04-08 11:47:53 +12:00
Damian Mooyman
8fa377ed65 Merge pull request #375 from scott1702/sitetree-icon
Add sitetree icon
2016-03-30 13:59:11 +13:00
Daniel Hensby
85f1490752 Merge pull request #382 from rasstislav/patch-2
Update UserFormsGridFieldFilterHeader.php
2016-03-23 20:33:15 +00:00
Daniel Hensby
8458c041b5 Merge pull request #383 from rasstislav/patch-3
Update UserDefinedForm_EmailRecipient.php
2016-03-23 20:31:45 +00:00
Daniel Hensby
4dbd35dfb0 Merge pull request #387 from rasstislav/patch-6
Translation fixes
2016-03-23 19:13:02 +00:00
Stephen Shkardoon
f1c84b0b25 Change IFNULL to COALESE for MSSQL Compatibility - Fix #447 2016-03-22 12:17:04 +13:00
Stephen Shkardoon
b825b6e42c Change CSV field export order to match form order - Fix #438
It will order the CSV field export to match the current order of the
field. Previously, it would be sorted alphabetically.
For any fields that are not in the current form, they'll be at the end
of the CSV, sorted by Title again.
2016-03-21 23:45:17 +13:00
Daniel Hensby
5da95abf27 Merge pull request #441 from tractorcow/pulls/fix-can-permissions
BUG Fix can* permissions on non-top level objects.
2016-03-21 09:11:17 +00:00
Nathan Glasl
cbe47268fc Correcting issue #439, where date pickers were no longer functioning. 2016-03-18 16:38:40 +11:00
John Milmine
249e7ca0d1 fixes late extensions binding
Construct adds extensions, so calling functions which have extend calls in them before the parent:constructor means the extend calls will never find any extensions.
2016-02-29 16:11:47 +13:00
Julian Seidenberg
4d1b10425f BUG fixing bug that prevents non-admin users from editing user defined form fields. 2016-02-16 17:58:04 +13:00
Nathan Glasl
1a767851e5 Implementing the "are you sure?" plugin to display a confirmation message when navigating away from a partially completed form. 2016-02-05 10:13:40 +11:00
Normann Lou
5460a9ef0f BUG call log() function on instance of UserFormsUpgradeService, to remove run time error that says 'log' function doesn't exists on UserFormsUpgradeTask class 2016-01-07 16:00:57 +13:00
David Craig
c3b3e1cc7a Add placeholder to Numeric and Email fields 2015-12-11 14:50:12 +13:00
rasstislav
9b18afd592 Translation fixes 2015-11-17 17:35:35 +01:00
rasstislav
b0d73bf008 Update UserDefinedForm_EmailRecipient.php 2015-11-17 14:48:53 +01:00
rasstislav
8f1986fc6a Update UserFormsGridFieldFilterHeader.php 2015-11-17 14:19:16 +01:00
scott1702
acc469b2e8 Add sitetree icon 2015-10-29 12:02:11 +13:00
Damian Mooyman
16472b8827 BUG Prevent subsequent write being triggered in onAfterWrite()
Fix minor JS error
2015-10-28 14:51:00 +13:00
Damian Mooyman
881fa401cb Merge pull request #358 from madmatt/pulls/hide-literalfield-label
ENHANCEMENT: Add 'HideLabel' field for EditableLiteralField objects
2015-10-22 10:15:56 +13:00
Damian Mooyman
000b024055 Merge pull request #364 from frankmullenger/emailobject-356
MINOR: New email object for each recipient
2015-10-19 12:56:38 +13:00
Frank Mullenger
5f5cedb3d1 MINOR: New email object for each recipient
Creating a new email object for each recipient so that no state from the previous email object is carried through. Fixes silverstripe/silverstripe-userforms#356.
2015-10-02 11:34:50 +13:00
madmatt
715be15a4d ENHANCEMENT: Add 'HideLabel' field for EditableLiteralField objects 2015-09-28 12:02:08 +13:00
Peter Thaleikis
96fd658c0d adding some spaces for better readability in 2015-09-24 10:40:30 +12:00
Frank Mullenger
2cea1ced31 Update UserDefinedForm.php
Casting to integer to prevent potential SQL injection.
2015-09-21 08:37:12 +12:00
Peter Thaleikis
fc0483454f remove trailing spaces in the codebase 2015-09-20 17:08:40 +12:00
Damian Mooyman
acede0d4ab BUG Fix duplication of forms with groups
Fixes #339
2015-09-18 11:56:58 +12:00
Damian Mooyman
1bf826d34e BUG Fix displayrule versioning 2015-09-18 11:07:58 +12:00
Peter Thaleikis
20cc915236 remove trailing spaces in the codebase 2015-09-11 10:20:06 +12:00
Christopher Pitt
99e771f942 Merge pull request #329 from spekulatius/adding-space-before-casing
adding a space before casting into a different type
2015-09-11 07:31:31 +12:00
Christopher Pitt
b383846790 Merge pull request #331 from spekulatius/adding-space
adding space
2015-09-11 07:30:32 +12:00
Peter Thaleikis
3434cb2cec converting spaces as intentation to tabs 2015-09-11 00:08:13 +12:00
Peter Thaleikis
b8cc50c676 adding space 2015-09-11 00:08:09 +12:00
Peter Thaleikis
e7a61dc815 adding a space before casting into a different type 2015-09-11 00:08:02 +12:00
Christopher Pitt
4556f1f38c Spelling correction to "authenication" 2015-08-31 14:49:16 +12:00
Damian Mooyman
d1ad43e23f BUG Fix CSV export with periods in the name 2015-08-31 11:17:18 +12:00
Damian Mooyman
1dd787327a API Integrate with secure assets module 2015-08-28 16:30:41 +12:00
Damian Mooyman
c4a95d59dc Merge pull request #320 from chillu/pulls/allowed-extensions-blacklist
API Disallow HTML uploads by default, make extensions configurable
2015-08-28 15:15:37 +12:00
Ingo Schommer
1794ef3594 API Disallow HTML uploads by default, make extensions configurable
HTML uploads are only relevant for SilverStripe 3.1,
since they're disallowed by default from 3.2 onwards in
the File.allowed_extensions configuration already.
2015-08-28 10:44:07 +12:00
Marco Kernler
fc16557b1d Added placeholder support for the EditableTextField 2015-08-27 13:54:28 +02:00
scott1702
cfa1f8345a add warning about publicly accessible files 2015-08-27 18:10:13 +12:00
David Craig
da400e8306 Fix multiple submit buttons being used 2015-08-24 10:38:02 +12:00
Christopher Pitt
a250fa3171 Merge pull request #310 from flashbackzoo/pulls/update-right-title
Consistant treatment of field's right title
2015-08-21 15:47:58 +12:00
David Craig
e9ef2a03aa Consistant treatment of field's right title 2015-08-21 15:21:33 +12:00
Damian Mooyman
543d79c326 Merge pull request #309 from scott1702/master
place gridfield buttons in button row
2015-08-21 14:43:25 +12:00
scott1702
2726fda72e place gridfield buttons in button row 2015-08-21 13:41:00 +12:00
Damian Mooyman
09553a1293 BUG Fix <form > tag being invalidly nested inside <p> tag 2015-08-21 12:26:52 +12:00
David Craig
952b9eafb0 Update multiple option field's template 2015-08-21 09:51:33 +12:00
Damian Mooyman
879dd38328 API Restrict "to" destination selection to only fields with pre-defined values 2015-08-19 14:04:11 +12:00
Damian Mooyman
ee62d8956f Merge pull request #295 from scott1702/feature/multi-page-forms-v2
fix heading fields only being <h> upon creation
2015-08-18 18:07:58 +12:00
scott1702
185eec3651 fix heading fields only being <h> upon creation
Change text from 'step' to 'page'
2015-08-18 17:45:25 +12:00
Damian Mooyman
ef888eda4b BUG Fix compatibility with php 5.3.3 2015-08-18 17:10:23 +12:00
David Craig
9907ac604f API support for conditional steps 2015-08-18 10:51:03 +12:00
Damian Mooyman
0a8c7636d7 BUG Fix double encoding of validation errors 2015-08-17 17:23:45 +12:00
Damian Mooyman
08d5736c48 BUG Fix empty pages 2015-08-17 15:40:02 +12:00
Christopher Pitt
bab2f2a074 Merge pull request #34 from tractorcow/pulls/fix-lots-of-bugs
BUG Fix issues when adding new formfields:
2015-08-17 15:13:55 +12:00
Damian Mooyman
5b8a9e7b04 Rename 'Radio field' to 'Radio Group' 2015-08-17 14:05:50 +12:00
Damian Mooyman
9535a2acd7 BUG Fix issues when adding new formfields:
- Page no longer reloads on new field
 - Preview mode no longer errors on new field
 - Sort order of field dropdown is ordered
 - Default field type to Text field instead of abstract base class
 - Ensure fields named 'Field' is invalidated.
2015-08-17 13:56:16 +12:00
Christopher Pitt
85f47e3623 Added segment field 2015-08-14 15:39:30 +12:00
Damian Mooyman
a1d7feedae Update form editor colours 2015-08-14 14:51:56 +12:00
Damian Mooyman
f1c408d3f4 BUG Fix form submission
BUG Fixed display logic
2015-08-13 18:57:23 +12:00
Damian Mooyman
7107ad7072 API Formfield validation for nested groups and pages 2015-08-13 12:24:54 +12:00
scott1702
b483a10566 Cms styling for fieldgroups 2015-08-12 16:24:06 +12:00
Damian Mooyman
4adc698e0f API Frontend form fields for nested composite fields 2015-08-12 16:08:32 +12:00
Damian Mooyman
5ba3d9b2e0 API Directly create editable fields on add 2015-08-12 12:45:25 +12:00
Damian Mooyman
a8ee26ec50 API Add field group (unfinished) 2015-08-12 09:57:54 +12:00
David Craig
1722e6ba40 Apply user defined values to form 2015-08-11 16:55:23 +12:00
Damian Mooyman
9f112e3b23 Add "Add page break" button
Fix unit test failures
2015-08-11 14:18:46 +12:00
David Craig
65651387e0 Update step rendering 2015-08-11 10:07:13 +12:00
David Craig
10c86bcbc1 Removed unused js 2015-08-10 13:18:50 +12:00
David Craig
e0aa7cd812 Add lightweight base form styling 2015-08-10 13:17:48 +12:00
David Craig
f1c1ec67ec Add front-end form navigation 2015-08-10 13:17:48 +12:00
David Craig
d83a450307 Initial multi-page form 2015-08-10 13:17:48 +12:00
David Craig
47c3df9c64 Make form editor a GridField 2015-08-10 13:17:48 +12:00
David Craig
51864a6308 API new form editor 2015-08-10 13:15:59 +12:00
Damian Mooyman
08b2e573f4 Merge pull request #283 from open-sausages/feature/test-recipient-email
Display form fields correctly in email preview
2015-07-22 14:09:42 +12:00
David Craig
5b06d80925 Display form fields correctly in email preview 2015-07-22 14:01:12 +12:00
David Craig
2e5de487c8 Add option for displaying error messages at the top of the form 2015-07-22 09:19:48 +12:00
Damian Mooyman
d17e8a773f API Custom rules for email recipients 2015-07-21 10:30:46 +12:00
Damian Mooyman
95d7b5f608 Merge pull request #281 from open-sausages/feature/better-email-templates
Better email templates
2015-07-21 09:49:03 +12:00
David Craig
350fdee850 Add custom email templates
- Developers can add email templates via a configurable path.
  - Content editors can select the email templates via a dropdown.
  - Content editors can embed HTML content in emails.
  - Content editors can preview HTML emails.
  - Content editors can use field values (merge fields) in emails.
2015-07-21 08:32:34 +12:00
Damian Mooyman
1df5b93dce BUG Fix file field ignoring allowed extensions 2015-07-16 09:29:51 +12:00
Myles Beardsmore
765a6b4130 Removed setter function
Removed setter function to reduce overhead and be more inline with current standards
2015-07-02 15:32:45 +12:00
Myles Beardsmore
9594625115 Added config setting for warning message. Set warning message to false by default 2015-06-23 23:06:09 +12:00
Will Rossiter
17bc3bce93 Add onPopulateFromPostData hook to match EditableFormField 2015-06-23 12:06:05 +12:00
Myles Beardsmore
a31f717774 Added warning message to page if no email recipients are configured. Also updated lang files to include the warning message. 2015-06-18 09:35:02 +12:00
Will Rossiter
11dfa1e3ad Use HTMLEditorField for LiteralField (Fixes #268) 2015-06-13 14:17:57 +12:00
Damian Mooyman
64b0d6203f BUG Fix compat with userforms/translatable 2015-05-29 15:49:36 +12:00
Will Rossiter
15f1df242b Merge pull request #258 from xini/fix-plain-text-email-format
place colon after field name for better usability of plain text emails
2015-04-28 17:26:19 +12:00
Michael
8ec1191da0 Wrapping getCMSFields fields with beforeUpdateCMSFields 2015-04-20 11:28:15 +09:30
Florian Thoma
d9dde81657 place colon after field name for better usability of plain text emails 2015-04-12 09:30:10 +10:00
Damian Mooyman
68b29e13e2 BUG Use correct api for assigning field value
BUG Fix encoding of cms add-option in js
ENHANCEMENT Sanitise literal HTML content
2015-02-23 11:41:23 +13:00
David Craig
99ac1a3e20 Disable the 'Submitted by' dropdown in form submissions view 2015-01-06 16:59:34 +13:00
Michael
fc0667599c Fixing and adding form field custom error messages code. 2014-12-22 12:19:33 +10:30
Will Rossiter
729318fc0a Merge pull request #241 from nhorstmeier/Bugfix_196
BUGFIX set email recipient on initial write()
2014-12-08 22:17:41 +13:00