Commit Graph

139 Commits

Author SHA1 Message Date
Robbie Averill
f488fcce83 Merge remote-tracking branch 'origin/4.3' into 4 2017-06-09 10:25:50 +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
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
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
Franco Springveldt
a94f0e35aa Enhancement: Implemented and/or display rules for UserForms 2017-04-28 10:22:15 +12:00
3Dgoo
ebbf9a727c ENHANCEMENT Changing form ID to be unique 2017-04-18 13:11:32 +12:00
Damian Mooyman
c349ae980e
BUG Use non-destructive pubilshing for editable options
Fixes #544
2017-03-13 10:14:30 +13: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
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
Nic Horstmeier
6e10acf6cd ENHANCEMENT setEmptyString option on EditableDropdown
closes #17
2016-11-16 17:04:54 -06: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
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
micmania1
cb605d5633 NEW Added option to allow empty values 2016-05-26 10:15:19 +12:00
micmania1
d614f9b382 Updated unit tests to match new value column 2016-05-26 10:15:03 +12:00
Damian Mooyman
bff2f2370f BUG Fix issue with maxlength="0"
Fixes #367
2016-05-16 18:05:05 +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
Chris Joe
ac4a6df7e9 Add permission tests for editing fix 2016-03-14 13:53:25 +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
madmatt
715be15a4d ENHANCEMENT: Add 'HideLabel' field for EditableLiteralField objects 2015-09-28 12:02:08 +13: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
Damian Mooyman
1dd787327a API Integrate with secure assets module 2015-08-28 16:30:41 +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
Damian Mooyman
09553a1293 BUG Fix <form > tag being invalidly nested inside <p> tag 2015-08-21 12:26:52 +12:00
Damian Mooyman
08d5736c48 BUG Fix empty pages 2015-08-17 15:40:02 +12:00
Christopher Pitt
85f47e3623 Added segment field 2015-08-14 15:39:30 +12:00
Damian Mooyman
9f112e3b23 Add "Add page break" button
Fix unit test failures
2015-08-11 14:18:46 +12:00
David Craig
51864a6308 API new form editor 2015-08-10 13:15:59 +12:00
Will Rossiter
8f92d75975 Make sure test classes don't duplicate common class names 2015-08-03 17:10:06 +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
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
Will Rossiter
4cdf44a1ef Update UserDefinedFormControllerTest.php 2014-12-03 14:52:57 +13:00
John Learn
083bba0c75 update failing test w/new field name. 2014-10-27 11:38:14 -04: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
ea7163f02e BUG: Fixes #179 broken unit tests caused by tests not having classes for ExtendedEditableFormField 2013-12-20 14:23:13 +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
107fee32a0 Make sure tests pass after adding clear button. 2013-11-25 13:55:42 +02:00
Will Rossiter
55a5187f79 FIX: escape columns and tables for postgres 2013-07-15 21:52:30 +12:00
Will Rossiter
b3805d2a8b Remove test for old submissions tab 2013-04-17 19:37:24 +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
Ruud Arentsen
75c6d40fa4 BUG Fix the 'always modified' label in treeview. Fixes #48.
userforms always reported 'modified' in the sitetree. Fixed the issue by
checking the userdefinedform record and the formfields.
2012-10-18 20:19:33 +13:00
Kirk Mayo
e4875edd05 BUG: Coding convention changes mainly replacing spaces with tabs 2012-07-17 16:09:31 +12:00
Kirk Mayo
4335d8d910 #BUGFIX: ticket 7314 fixing the PHPUnit tests for SS 3.0 2012-06-22 12:21:08 +12:00
Will Rossiter
d08543f705 MINOR: translate pages string in submittedformfield. MINOR: updated unit test to reflect updated template 2012-05-19 10:49:34 +12:00
Will Rossiter
3256663cad BUGFIX: fixes for 3.0 unit tests. Ensure form is not shown if no fields in the list, Prevent nested with getSubmissions(). 2012-05-07 22:00:18 +12:00
Stig Lindqvist
4f50dd287e MINOR Deprecation fixes to the SubmittedFormTest 2012-05-07 17:41:29 +12:00
Stig Lindqvist
98256fc8bf MINOR Circumvent the sloppy array_key_exists() check in YAMLFixture::writeDataObject() by adding ID fields to SubmittedFormTest.yml 2012-05-07 17:41:29 +12:00
Stig Lindqvist
816edabd3f MINOR Added public keyword for methods (style guidelines) 2012-05-07 17:41:29 +12:00
edchipman@gmail.com
ef3953fc68 Replaced instances of new DataObjectSet() with new ArrayList()
Removed Validator::set_javascript_validation_handler() call
2012-05-07 17:41:29 +12:00
edchipman@gmail.com
5de26cd897 Replaced all instances of new FieldSet() with new FieldList()
Replaced the complex table field used for editing the email recipients with GridField

Replaced instances of SAPPHIRE_DIR with FRAMEWORK_DIR

Replaced instances of sapphire/ in css and templates with framework/

Re-organized tabs on user defined form so they are top level

Replaced calls to toDropdownMap() with map()

Renamed getCMSFields_forPopup() top getCMSFields()
2012-05-07 17:41:29 +12:00
Will Rossiter
2c9e68a928 MINOR: clean up of project. MINOR: removed versioned task. Out of date for usage. 2012-04-14 21:59:56 +12:00
Will Rossiter
fed25ad45b BUGFIX: added exists() check on getFormFields (via Bruce Walter) to prevent fieldless forms. BUGFIX: if built form is empty still strip the $UserDefinedForm token out of the content. 2011-03-21 09:14:45 +13:00
Will Rossiter
fb3fb184e1 BUGFIX: fixed incorrect formatting for jQuery.validate rules. ENHANCEMENT: added getErrorMessage() to ensure consistent error messages. BUGFIX: readded missing custom messages 2010-12-19 01:19:19 +00:00
Ingo Schommer
a71b553fd6 BUGFIX Fixed UserDefinedFormControllerTest to work with globally disabled security tokens (API change in 2.4.3) 2010-11-01 02:22:29 +00:00
Mateusz Uzdowski
078043f189 BUGFIX: encode the csv file by hand, fputcsv is not parsing newlines properly 2010-10-21 23:41:47 +00:00
Mateusz Uzdowski
cec87a859e BUGFIX: ORDER BY in nested query does not work under MSSQL, remove 2010-10-08 00:56:52 +00:00
Mateusz Uzdowski
a2e998ab79 BUGFIX: IN clause was not being picked up, failing in MSSQL and not giving proper results on MySQL (OS ticket 6072) 2010-10-08 00:29:18 +00:00
Mateusz Uzdowski
8d3cb472dc BUGFIX: remove reliance on str_getcsv (it's PHP 5.3 only).
ENHANCEMENT: sort the columns according to the most recent form setup (thanks jonomenz for the query)
ENHANCEMENT: test quotes and commas
2010-10-07 23:06:49 +00:00
Mateusz Uzdowski
14ff7759a7 BUGFIX: rewrite the export function to fix the bug that multiplied columns when adding rows, and to use built-in php csv functions. 2010-10-07 21:37:21 +00:00
Mark Stephens
d99b76723c MINOR: unit test assuming database IDs, doesn't hold in postgres 2010-09-20 04:18:25 +00:00
Mark Stephens
3bb82d43f6 BUGFIX: ansi-compliant SQL in unit test 2010-09-20 03:54:00 +00:00
Will Rossiter
48fbd30bc4 MINOR: commented out unfinished test 2010-09-08 10:52:19 +00:00
Will Rossiter
503c5c3ff6 ENHANCEMENT: implemented tests for exporting csv files 2010-09-08 10:35:43 +00:00
Will Rossiter
7eef5646e5 ENHANCEMENT: added test coverage for populateFromPostData() 2010-09-08 03:20:28 +00:00
Will Rossiter
bc0d4c7692 ENHANCEMENT: Implemented tests to complete email recipients class. APICHANGE: changed *FieldSettings() to *Setting() 2010-09-07 22:44:43 +00:00
Will Rossiter
3c1d81d014 ENHANCEMENT: added test coverage for UserDefinedForm.php and placeholders for other sections. API change: processNewFormFields removed
API change: refactored Form() into getFormFields(), getFormActions(), getRequiredFields()

ENHANCEMENT: added updateForm* extension hooks to allow customization of userforms
BUGFIX: gave custom scripts their own ID to enable it to be blocked.
2010-09-03 05:06:13 +00:00
Mateusz Uzdowski
3c638d27fc MINOR: fixed spelling mistake (related to 99491) 2010-02-22 01:37:27 +00:00
Will Rossiter
70f05b891e BUGFIX: fixed conflict of Versioned extension functions. MINOR: added tests for publishing multiple option fields 2009-12-12 08:59:20 +00:00
Ingo Schommer
db4cd3de31 BUGFIX Fixed UserDefinedFormEditorTest: Logging in before publishing so canPublish() doesnt return false 2009-11-09 04:48:35 +00:00
Sam Minnee
2ca993b7c4 BUGFIX: Updated module to support 2.4 API changes 2009-10-26 22:04:11 +00:00
Ingo Schommer
97e49b296f BUGFIX Fixed column naming in UserDefinedFormEditorTest 2009-10-15 19:48:08 +00:00
Sean Harvey
4cfe303989 MINOR Fixed where clauses to use ANSI compatible SQL in UserDefinedFormEditorTest 2009-10-06 05:11:12 +00:00
Sean Harvey
3fe18477d8 MINOR Removed backticks from queries in UserDefinedFormEditorTest because they break SQL Server and PostgreSQL 2009-10-06 04:22:29 +00:00
Will Rossiter
379bcc7921 ENHANCEMENT: added inital versioning / staging support to userforms. Supports different forms on stage / live. ENHANCEMENT: added unit tests to cover versioning / staging 2009-09-22 22:36:53 +00:00
Will Rossiter
07c8ad9ff3 BUGFIX: make sure to delete an object from the test 2009-04-17 02:29:40 +00:00
Will Rossiter
83d1f2fe86 ENHANCEMENT: rewrote the user defined forms cms JS into jquery. ENHANCEMENT: rewrote templates and removed dulicate code. APICHANGE: created parent class for EditableFormField, EditableOption and EditableMultiOption to prevent code duplication. MINOR: added icon for literal field. MINOR: added quick unit test. MINOR: removed dulicate images 2009-04-17 02:26:40 +00:00