tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity
1,660 Commits 33 Branches 167 Tags 15 MiB
02c15f321a
Commit Graph

797 Commits

Author SHA1 Message Date
Robbie Averill
93c25b764f Merge remote-tracking branch 'origin/4.3' into 4 2017-06-26 18:17:06 +12:00
Robbie Averill
fa5ca24110 Merge remote-tracking branch 'origin/4.2' into 4.3 2017-06-26 18:14:23 +12:00
Franco Springveldt
08b0a74124 Merge pull request #621 from creative-commoners/pulls/4.2/fix-submissions-gridfield-state 
FIX Pass submissions GridFieldConfig to GridField constructor to avoid error in state
 2017-06-26 18:07:24 +12:00
Franco Springveldt
a1a7a0f51f Merge pull request #622 from creative-commoners/pulls/4.2/cache-display-rules-model-loads 
Use get_by_id on display rules model loads to ensure they get cached
 2017-06-26 15:02:51 +12:00
Robbie Averill
683ee14428 FIX Preview recipient email link for SS 3.6 2017-06-21 15:42:18 +12:00
Robbie Averill
f24af09f00 Use get_by_id on display rules model loads to ensure they get cached 2017-06-21 14:14:17 +12:00
Robbie Averill
d88ce28174 FIX Pass submissions GridFieldConfig to GridField constructor to avoid error in state 
This framework bug causes the submissions GridField to lose the filter context when exporting as CSV. Passing the config directly to the GridField constructor allows the state to be set containing the config, where setting it after construction will lose this context. This will be fixed in SS 3.5.x and 3.6.x core releases, but this fix patches it for userforms anyway.
 2017-06-20 15:35:36 +12:00
Robbie Averill
427ce3432b Merge pull request #619 from camfindlay/feature/submitter-email 
ENHANCEMENT Display and export the submitter email
 2017-06-19 17:30:37 +12:00
Cam Findlay
5ad7767ead ENHANCEMENT Display and export the submitter email 2017-06-19 12:15:56 +12:00
Franco Springveldt
630c5c3395 Merge pull request #612 from creative-commoners/pulls/4.2/fix-email-template-rendering 
Update UserFormRecipientItemRequest::preview to use theme-templates
 2017-06-16 11:39:02 +12:00
Robbie Averill
558c61097d Merge remote-tracking branch 'origin/4' 2017-06-13 12:58:10 +12:00
Robbie Averill
89656e8ac9 Merge remote-tracking branch 'origin/4.3' into 4 2017-06-13 12:57:46 +12:00
Robbie Averill
728647cb71 Merge remote-tracking branch 'origin/4.2' into 4.3 2017-06-13 12:32:11 +12:00
Florian Thoma
4b2669242d leave escaping of value to template 2017-06-13 09:49:02 +10:00
Robbie Averill
bf20e19285 FIX Ensure HTML email preview content is parsed as HTML including shortcodes 2017-06-12 12:03:05 +12:00
Robbie Averill
f9bf407295 Merge remote-tracking branch 'origin/4' 2017-06-09 11:29:44 +12:00
Robbie Averill
e96594247b FIX Selector for HTML/plain email content toggle. Show preview button for both. 2017-06-09 11:04:52 +12:00
Florian Thoma
6e69972c35 fix default values for EditableMultipleOptionField subclasses 2017-06-09 09:01:56 +10:00
Robbie Averill
f488fcce83 Merge remote-tracking branch 'origin/4.3' into 4 2017-06-09 10:25:50 +12:00
Robbie Averill
c02181e69b FIX Use configuration nesting wrapper around themed preview logic 2017-06-09 10:19:58 +12:00
Michael van Schaik
091997027b Adding back previous value for SSViewer::theme_enabled 2017-06-09 10:17:34 +12:00
Michael van Schaik
dcc821f3c6 Update UserFormRecipientItemRequest::preview to use theme-templates 
Fixes #556
 2017-06-09 10:17:27 +12:00
Robbie Averill
51890f6084 FIX Remove "hide" class from form inputs, leave it on the field holder - fixes display rules issue 2017-06-06 10:13:09 +12:00
Reece Alexander
e86306c7bf FIX incorrect calculation of MAX_FILE_SIZE (#600) 
* Fixes incorrect calculation of MAX_FILE_SIZE

* Fixes expected bytes in EditableFileFiled test
 2017-05-25 09:32:06 +12:00
Reece Alexander
ec2b012eed FIX incorrect calculation of MAX_FILE_SIZE (#600) 
* Fixes incorrect calculation of MAX_FILE_SIZE

* Fixes expected bytes in EditableFileFiled test
 2017-05-24 18:31:25 +12:00
Robbie Averill
5777b33f37 Merge pull request #599 from silverstripe/bugfix/empty-column-gridfield 
Remove empty column in display logic GridField for form field
 2017-05-24 16:08:18 +12:00
Sacha Judd
ca1e2abd83 FIX Remove empty column in display logic GridField for form field 2017-05-24 13:58:48 +12:00
Robbie Averill
7c3edd4d51 FIX Hide and show form fields by toggling the "hide" class instead of jQuery methods 2017-05-22 15:54:28 +12:00
Robbie Averill
11f43c27dc FIX Make EditableLiteralField extensible, have its own template, honour visibility rules 2017-05-18 10:34:04 +12:00
Franco Springveldt
6fd952c737 Adding extra filters (GreaterThan, LessThan, etc.) to Email Custom Rules (#590) 2017-05-15 18:03:51 +12:00
Franco Springveldt
2357ce02ad NEW Email custom rules now supports GreaterThan, LessThan, etc conditionals 2017-05-15 14:05:18 +12:00
michael3dgoo
ada8dac4b1 Removing HideFieldLabels code 2017-05-08 15:48:33 +09:30
michael3dgoo
4451d0c94d CSS hide when ShowOnLoad false 2017-05-08 06:49:20 +09:30
torleif
dc530c0381 Fixes #529 2017-05-01 17:50:39 +12:00
Damian Mooyman
c78942474c Merge 4 into master 2017-05-01 17:47:44 +12:00
Damian Mooyman
e7e810d0f8 Merge 4.3 into 4 2017-05-01 17:44:39 +12:00
Damian Mooyman
d756578a26 Merge remote-tracking branch 'origin/4.1' into 4.2 2017-05-01 17:38:57 +12:00
Damian Mooyman
eea6572ac1 merge 4.0 into 4.1 2017-05-01 17:38:15 +12:00
3Dgoo
457a8a7557 API Moving placeholder variable to EditableFormField (#581) 2017-04-28 20:31:51 +12:00
Franco Springveldt
a94f0e35aa Enhancement: Implemented and/or display rules for UserForms 2017-04-28 10:22:15 +12:00
Juan van den Anker
7983a7f119 Enhancement: added an extension point to UserDefinedForm.finished 2017-04-24 07:56:18 +12:00
3Dgoo
ebbf9a727c ENHANCEMENT Changing form ID to be unique 2017-04-18 13:11:32 +12:00
Robbie Averill
2e73787088 FIX Add translation to some areas of EditableFormField that were missing them (#568) 
This commit recreates https://github.com/silverstripe/silverstripe-userforms/pull/386 from
@rasstislav.
 2017-04-11 08:15:29 +12:00
Daniel Hensby
5b6c16dbd6 Merge pull request #550 from robbyahn/bugfix/issue-547-radio-button 
issue-547 radio button group display fix
 2017-04-03 16:57:55 +01:00
Loz Calver
bf391697fa Fix casting bug with email previews (#549) 2017-04-03 10:35:16 +12:00
3Dgoo
d16692d9c1 Adding block_default_userforms_css and block_default_userforms_ js config variables to control whether to load css and JavaScript files or not. (#562) 2017-04-01 23:02:18 +13:00
Damian Mooyman
c349ae980e
BUG Use non-destructive pubilshing for editable options 
Fixes #544
 2017-03-13 10:14:30 +13:00
Daniel Hensby
84eecb0b76 Merge pull request #553 from TcFxGt4AGE/patch-1 
Fix logic for radio buttons
 2017-03-06 17:15:38 +00:00
Derek Kaijser
9a5144104c Fix empty file fields 
Fix for empty file fields when not all upload fields are used.
 2017-03-02 12:46:13 +13:00
Derek Kaijser
3d8f5d1406 Fix logic for radio buttons 
parents only works if you have a single radio group with conditionals.
closest is what we want.
 2017-03-02 11:58:39 +13:00
Matthew Hailwood
704690b798 Make getMergeFieldsMap protected 
Annoying having to copy this method if you want to replace "process" in an extending class so we'll make it a bit looser shall we?
 2017-03-01 10:33:05 +13:00
robbyahn
ba39031426 issue-547 radio button group display fix 2017-02-24 04:06:06 +13:00
Danae
bb000ca893 FIX: Change delete() to deleteFromStage() for EditableMultipleOptionField::doPublish(). This fixes the issue where options were being removed from the draft table instead of the Live table, effectively deleting them from the CMS (#545) 2017-02-14 15:47:16 +13:00
Daniel Hensby
3e9a271310
Merge branch '4.3' into 4 2017-02-03 15:17:09 +00:00
Daniel Hensby
94bbbc0954
Merge branch '4.1' into 4.2 2017-02-03 15:05:03 +00:00
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
David Craig
c33b8ddec1 Use $.prop() to query checkboxes 2014-12-03 13:59:42 +13:00
Will Rossiter
319d1972b1 FIX: Dropdowns not responding to conditional logic 
Ensures the correct actions are listened for.
 2014-12-02 19:49:03 +13:00
muskie9
7e92af61fd BUGFIX set email recipient on initial write() 
This checks if the Form() relation ID is set, if not, then grab the current page from the session and use it's ID to get teh Editable Fields for dropdowns.

fixes #196
 2014-12-01 14:46:02 -06:00
Will Rossiter
7a76626cd2 Redirecting to the form success message location for longer pages 2014-11-28 18:16:50 +13:00
Brice Burgess
833f171496 remove unnecessary call to getURLParams() 
The result of getURLParams was never used / cleaned up -- and it breaks the ability to edit a UserDefinedForm in a GridField.  (eg via the holderpage or versioned-gridfield module)
 2014-11-25 17:09:06 -05:00
John Learn
75858dab7a fix naming of gridfield so it works with translatable. 2014-10-21 12:52:43 -04:00
Will Rossiter
e8e41826da Add getEditableField() helper 2014-08-11 11:12:00 +12:00
Will Rossiter
23963e2a47 FIX: disable jquery.validation with date fields 
Inconsistent with date locale formats.
 2014-08-11 11:09:31 +12:00
James Ayers
0f90ce9596 Improved FieldEditor to dynamically get the class for EditableOptions 2014-08-06 15:23:51 +12:00
Will Rossiter
42932ea47f Add flags to configure use of cookies. 
Adds 2 new flags to the CMS:

- DisableCsrfSecurityToken
- DisableAuthenicatedFinishAction

DisableAuthenicatedFinishAction disables the session check on the finish completed action as this normally validates the user correctly posted a form. This page is normally just basic content so requiring a session cookie is sometimes a hassle.

DisableCsrfSecurityToken allows security token to not be added to the form. Normally acceptable as forms don't usually alter the state of the database.
 2014-07-27 20:51:23 +12:00
Will Rossiter
5568ee7875 Fix CheckboxGroupField validation (Fixes #209) 2014-07-25 14:53:13 +12:00
mikeyc7m
386eb363ad Use numericfield for EditableNumericField 
Add support for minimum and maximum values
 2014-07-24 21:39:07 +12:00
Liongold
dbb68258c5 Extra Space at line 1018 
When a user chose the Plain Text option, the first field would have a blank space preceding the field name.
 2014-07-12 17:52:16 +02:00
Will Rossiter
c77830bd2f Pass submission to finished action. 2014-07-12 09:43:52 +12:00
alex-dna
248ff61ebe Update UserDefinedForm.php 
Add updateAfterProcess hook
 2014-07-09 16:32:10 +12:00
Will Rossiter
a9aefe38ea Add onPopulateFromPostData extension hook 2014-07-09 11:55:54 +12:00
Will Rossiter
73cfcc6791 Correct variable name (Fixes #206) 2014-07-06 17:50:21 +12:00
Will Rossiter
29d59693ac Fetch permissions from the parent field (Fixes #218) 2014-07-06 17:35:46 +12:00
Jean Spiteri
fead9d00c6 Implementing the Dynamic Subject feature 2014-07-06 17:33:50 +12:00
Will Rossiter
2767558ec8 Add SubmittedFormField::onPopulationFromField extension hook 2014-07-06 17:03:13 +12:00
Will Rossiter
817b80412d Merge pull request #202 from icecaster/patch-3 
Fixed redirect url generation to work without trailing slashes
 2014-07-06 16:52:21 +12:00
Will Rossiter
8c33896798 Merge pull request #191 from silverstripe-rebelalliance/inputVars 
NEW: Add a check + error message if input vars is exceded
 2014-07-06 16:07:33 +12:00
Will Rossiter
c4fe6beca5 Fix escaping of newline's in emails (Fixes #217) 2014-06-20 14:08:17 +12:00
Damian Mooyman
b7429910d5 API Support bulk editing tools if available 2014-06-18 13:10:31 +12:00
Damian Mooyman
5e0b7fdf7a Updated jquery validate plugin (dist files only) 
Cleanup of validation script. Refactor into template to allow customisation of validation.
Explicitly set error element to 'span' as per new jquery-validate support
[ref: CWPBUG-110]
 2014-05-22 10:34:11 +12:00
Will Rossiter
bce1da2d71 Merge pull request #210 from Focus-Flow/require-localized-validator-messages-and-methods 
Require localization files for validator
 2014-05-15 10:16:24 +01:00
Jyrki Lilja
5689afb6b4 Require localization files for validator 2014-05-15 10:08:20 +03:00
Will Rossiter
b54e7fa4c6 Correct location for getValueFromData() 2014-04-25 09:53:45 -04:00
Will Rossiter
cbeb7a82e8 FIX: field validation 2014-04-22 16:46:57 -07:00
Tim
3f7c57dcbf Fixed redirect url generation to work without trailing slashes 
fix url redirect generation, 
using action parameter on $this->Link() to pass 'complete' action
to stop relying on trailing slashes.
 2014-04-15 12:10:32 +12:00
Kirk Mayo
d5e50a9802 NEW: Allow form submission when tokens are disabled 2014-02-27 12:36:12 +13:00
Kirk Mayo
53b306a434 NEW: Add a check + error message if input vars is exceded 2014-02-21 14:19:14 +13:00
Kirk Mayo
0f647009fa BUG: Do not add a default message for numeric and email fields 
BUG: Corrected classname to use right object
 2014-02-12 12:45:49 +13:00
Kirk Mayo
85c1f52c45 BUG: Fixes #189 default error message being shown 2014-02-12 12:14:56 +13:00
Kirk Mayo
be573dcd3c NEW: Set MinLength and MaxLength to numeric fields 
BUG: replaced spaces with tabs to meet coding conventions
 2014-02-11 10:31:56 +13:00
Kirk Mayo
938d2059fa NEW: Added a numeric field and associated png 
NEW: Setup translations for number field

NEW: extend fromEditableTextfield use number class
 2014-02-11 08:59:43 +13:00
Will Rossiter
f90b997c29 Add updateEmailData hook 2014-02-03 12:10:44 +13:00
mikeyc7m
19afd18c26 Update FieldEditor.php 
The EditableMultipleOptionField is being exposed in the form builder, when it is added to the form the page dies! It needs to be excluded.
 2014-01-31 09:37:09 +11:00
Kirk Mayo
54b4dca799 BUG: Fixing unit tests for form processing and adding unit test to check if form has been completed 2014-01-06 15:15:01 +13:00
Kirk Mayo
41b6e57e4c Merge branch 'master' of git://github.com/silverstripe/silverstripe-userforms into issue69 2014-01-06 13:37:55 +13:00
Will Rossiter
07c159cd61 NEW Allow EditableFileField to define destination folder. (Fixes #20, #177) 2013-12-20 21:08:00 +13:00
Kirk Mayo
4c88f1acf9 BUG: Fixes #69 by adding a check to see if the form has been processed 2013-12-19 15:56:53 +13:00
Nik Rolls
da6a624b6c - Added calls to Object#extend in EditableFormField's getFieldConfiguration and getFieldValidationOptions 
- Added tests for extensions on EditableFormField
 2013-12-05 19:08:08 +13:00
Jyrki Lilja
79682e7627 Fix #175. Bring back support checking for radio field values. 2013-12-03 20:10:17 +13:00
Sean Harvey
425881257b BUG Performance improvements of SubmittedFormField queries. 
When there are a lot of SubmittedForm records the UserDefinedForm
page takes a long time to load in the CMS, and oftens exceeds
the PHP memory limit well beyond 128M.

Previously UserDefinedForm::getCMSFields() would build a list of
name => value from all SubmittedFormField records, but it would
do this twice, once in getCMSFields() and another time in
UserFormsGridFieldFilterHeader. It would also use the full ORM
to build this list, when all it needs is a map of the Name
and Value columns.

This fixes that to build the columns once in getCMSFields() using
DB::query() and it'll pass those columns along to
UserFormsGridFieldFilterHeader as well so it doesn't do it twice.
 2013-11-13 17:08:49 +13:00
Jyrki Lilja
27d4476dec Add support for defining clear button text. 
A new translations to be added:

- UserDefinedForm.CLEARBUTTON
- UserDefinedForm.TEXTONCLEAR
 2013-11-11 15:32:44 +02:00
Ingo Schommer
323f66ad74 Fixed globalisation for field list 2013-11-06 15:05:31 +01:00
Mike Penhall
a6400dcfd0 Update FieldEditor.php 2013-11-04 16:08:32 +13:00
Mike Penhall
06ad657f6c Escaped addField() query to work with Postgres 
I was getting a warning in the CMS with a Postgres database due to the fields on lines 191 - 193 not being double quoted.
 2013-11-01 16:08:15 +13:00
Ingo Schommer
aa0f8dbc7b Transifex support, js globalisation 2013-10-30 14:31:51 +01:00
Will Rossiter
f66c3c340a Merge pull request #168 from danieldia/patch-1 
FIX: Ensure that the data-add-url single quotes are not processed by join_links
 2013-10-17 00:25:12 -07:00
danieldia
bbe1c5fb6a FIX: Ensured that the data-add-url single quotes are not processed by join_links 
Due to the fact that the last bracket meant that join_links was actually sent URL + ' (eg; http://myurl.com' ), this caused problems when the quote was getting escaped - and actually prevented users from adding form fields in the CMS, with a 500. This fix ensures the closing quote is not processed by join_links.
 2013-10-17 16:05:04 +13:00
Kirk Mayo
99de36afef BUG: Fixes #166 for SQL server which does not like empty strings as numerics 2013-10-17 15:01:41 +13:00
Will Rossiter
099e91807b Merge pull request #160 from hafriedlander/fix/filefield 
FIX submitted fieldfields in submission details in CMS
 2013-09-04 17:14:06 -07:00
Hamish Friedlander
0c39fad116 FIX submitted fieldfields in submission details in CMS 
If you had a EditableFileField in your userform, the submission table in
the CMS would just say "Array" rather than link to the file, making it fairly
useless
 2013-09-05 09:46:38 +12:00
Will Rossiter
9b134f1a78 FIX: Check security ID on admin non form links (Fixes #158) 2013-09-04 23:35:01 +12:00
Mellisa Hankins
86992971f8 FEATURE: Add data and form arguments to Filtered Email Recipients 
Most use cases for Filtered Email Recipients will probably require
using the data submitted via the user form.
 2013-09-04 16:32:24 +10:00
Hamish Friedlander
d887f0e196 FIX EditableCountryDowndownField being broken by removal of Geoip in 3.0 2013-08-29 14:03:09 +12:00
Will Rossiter
55a5187f79 FIX: escape columns and tables for postgres 2013-07-15 21:52:30 +12:00
Will Rossiter
775eb66053 private statics for 3.1 2013-07-15 20:49:49 +12:00
Mateusz Uzdowski
eae3283e4c BUG Update allowed_actions on frontend Controller. 2013-07-09 15:20:19 +12:00
Will Rossiter
3352fe38b0 Merge pull request #132 from Focus-Flow/bug/quotes-in-editableoption-title 
BUG: support quotes in EditableOption Title
 2013-06-04 02:52:18 -07:00
Will Rossiter
d20ab0dd89 Merge pull request #129 from silverstripe-rebelalliance/hackathon 
BUG: Fixes #119 adds a tasks to clean up columns for EditableFormField
 2013-06-04 02:51:11 -07:00
Freddy Vulto
4c7d50217f Fix duplication of custom rules. Rules may depend on fields. These internal field IDs in the targets now also get updated to their new names (GitHub: #19). 2013-06-04 21:48:29 +12:00
Jyrki Lilja
896e8591f7 BUG: Use $this->Title correctly. 2013-06-04 09:17:23 +03:00
Jyrki Lilja
0b0834c873 BUG: Fix radio field with " in Title. 2013-06-04 08:20:03 +03:00
Jyrki Lilja
e8aeb692fd BUG: Fix checkbox group with " in option titles. 2013-06-04 08:15:57 +03:00
Will Rossiter
b81e4cb7c9 FIX: update visibility of static 2013-06-02 14:08:10 +12:00
Kirk Mayo
a43988af60 BUG: Fixes #119 adds a tasks to clean up columns for EditableFormField 2013-05-25 16:03:59 +12:00
Sean Harvey
e5f8d13b15 BUG SubmittedForm can't be created by non-ADMIN 2013-05-13 14:32:41 +12:00
Sean Harvey
3f223b691b BUG Normal users (non-ADMIN) can't create any email recipients 2013-05-13 14:31:25 +12:00
Sean Harvey
3de6795aa4 BUG Fixing non-ADMIN permission to view SubmittedForm/SubmittedFormField 2013-05-01 10:49:57 +12:00
Fred Condo
756f15a4ac Restore the EditableCountryDropdownField class 
Reverts "MINOR Removed the country dropdown field due to the framework
has removed the CountryDropdownField"

This reverts commit cbe1dce4ff.

Framework has not, in fact, removed CountryDropdownField. This commit
restores the EditableCountryDropdownField class.
 2013-04-24 09:57:33 -07:00
ARNHOE
9ac8500b41 Fixed typo, live validation works again 2013-04-22 17:17:40 +03:00
Will Rossiter
a8ca0184c3 FIX: validate required fields even with rules. (Fixes #116) 2013-04-17 19:31:09 +12:00
Damian Mooyman
a0f48d636e BUG Fixed incorrect static member declaration 
- Changed configurable static variables to private as per recent API updates to 3.1
- Use of statics as configurable variables replaced with config api usage
 2013-04-10 11:35:58 +12:00
Fred Condo
f0f9ea702c BUG: Set the summary fields of UserDefinedForm_EmailRecipient dynamically via config system 
You can't dynamically expose statics; that's a no-op in 3.1
 2013-04-04 12:14:22 -07:00
Fred Condo
656a9fbb4e BUG: Fix access to static configuration variables 
- Make statics private
- Use Config::get rather than eval to read private statics
- Add a helper function to expose UserDefinedForm_EmailRecipient::$summary_fields
  (to make them available for i18n).
 2013-04-03 14:31:37 -07:00
Ash Kyd
68bc428fe2 Added check for a blank title in the HTML Block/EditableLiteralField so we don't print empty labels. 2013-04-03 12:35:02 +10:00
Stephen Shkardoon
5c9a962b21 Uncasted user input cause SQL issues 2013-03-24 23:35:23 +13:00
Will Rossiter
b096cf611a FIX: update DropdownField usage for 3.1 2013-03-21 23:22:51 +13:00
Will Rossiter
416a5b8864 FIX: fix submissions grid field in 3.0 versions (#96, #100) 2013-03-16 12:18:51 +13:00
mschilder
caec25101d Update UserDefinedForm.php 
Changed two typos: UserDefinedform must be UserDefinedForm
 2013-03-15 12:32:07 +01:00
Will Rossiter
75fb471f2c FIX use sqlquery for building sort query 2013-03-05 11:36:39 +13:00
Will Rossiter
c4c547321c NEW Filter submissions by created date 2013-03-05 11:10:23 +13:00
Will Rossiter
8e252c88ed NEW Migrate submissions section to a GridField instance. (Fixes #94) 2013-03-05 10:45:54 +13:00
Will Rossiter
527b63786d FIX Resolve issue with multiple dependent rules 
Implementation of the rules required that a dependent field could only rely on one implementation. This patch joins all those dependencies together in one function to exclude. Tests / a rewrite of this behavior is on the horizon.
 2013-02-27 16:05:30 +13:00
Will Rossiter
55c455b802 FIX: remove redundant extension definition 2013-02-04 20:15:07 +13:00
Menno Schilder
3015997bdf Added Placeholders.js to enable placeholder functionality in IE9 and below 2013-01-29 22:46:34 +13:00
Menno Schilder
cd9af7e13f Added options to enable live validation and hide field labels 2013-01-29 22:46:34 +13:00
Prem Mariappan
203898bd1a FIX: duplicate replyTo addresses appended 2013-01-29 22:40:28 +13:00
Will Rossiter
6f671d304d FIX: save a null value instead of upload data. (Fixes #87) 2013-01-29 21:44:00 +13:00
Will Rossiter
31659ed61c Merge pull request #76 from silverstripe-droptables/translatable-compatible 
FIX: Build URLs to respect other parameters
 2012-12-13 18:23:45 -08:00
Robert Curry
2861bbdf0c BUG Build URLs to respect other parameters 2012-12-14 14:55:31 +13:00
Sean Harvey
3923ec325d Adding ability to extend EmailRecipients so they can be filtered 2012-12-11 17:09:02 +13:00