Commit Graph

839 Commits

Author SHA1 Message Date
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
Will Rossiter 658b4dc02a Reduce code duplication, share test fixtures 2017-10-16 10:13:01 +13:00
Will Rossiter cf6c1b44ba Controller should be under control namespace for consistency 2017-10-10 08:48:16 +13:00
Will Rossiter 0287726337 NEW Add ability to run a UserForm on any DataObject via traits. 2017-10-09 15:05:41 +13:00
Robbie Averill c6ad8648fd Merge branch '4' 2017-09-26 11:30:56 +13:00
Franco Springveldt bb8f9173ec Merge pull request #662 from creative-commoners/pulls/5.0/update-docs
DOCS Update dev and userguide docs for SS4, new screenshots, etc
2017-09-22 16:04:52 +12:00
Robbie Averill 7edc058121 FIX Escape dollar signs in UserForm contents before inserting them with regex 2017-09-22 14:43:46 +12:00
Robbie Averill 6836174a65 API Remove deprecated migrateSettings() and secure assets integration code 2017-09-21 09:40:04 +12:00
Robbie Averill d66b06dbe4 FIX Merge field markup to match core SS4 field markup, add button_text config static 2017-09-20 16:31:40 +12:00
Robbie Averill de3c8db399 API Remove deprecated methods in EditableFormField, add upgrade guide for UF 4-5 2017-09-19 16:04:48 +12:00
Sacha Judd bd955d7274 NEW Remove class hidden-on-hover and update styles for userforms ss4 2017-09-06 14:23:34 +12:00
Robbie Averill be0b843981 FIX Remove unused namespace references and add to doc block references 2017-09-05 09:53:35 +12:00
Robbie Averill 9929284a9b FIX Replace static session getter for the current page ID 2017-09-04 16:56:42 +12:00
Robbie Averill faf04bff43 FIX Tests for email templates and whether they exist or not 2017-08-24 15:29:27 +12:00
Robbie Averill 298441b50b FIX Use bootstrap for "preview email" button in recipients form 2017-08-24 15:17:16 +12:00
Robbie Averill 4942ac35ad FIX Email preview renders as HTML, template selection works, use correct callbacks in GridField summary 2017-08-24 15:15:36 +12:00
Robbie Averill 100b84dc08 FIX Show correct class names in field editor GridField dropdowns 2017-08-23 10:04:42 +12:00
Robbie Averill d90d54186e FIX Update requirements paths to match webpack dists 2017-08-23 09:27:12 +12:00
Robbie Averill 12aad64972 FIX Update namespacing and include paths in new multiple option field tests 2017-08-22 16:40:18 +12:00
Robbie Averill 91bac6dcf4 FIX Add namespaces for UserFormsOptionSetField template and EditableMultipleOptionField templates 2017-08-22 16:40:18 +12:00
Robbie Averill d3d2ae591f FIX Re-implement jquery validate localisation, move thirdparty JS libs to client dir 2017-08-22 16:40:17 +12:00
Robbie Averill f25f1e9c1b FIX UserFormFieldEditorExtension::onAfterDuplicate accepts the correct parameters from DataObject::duplicate 2017-08-22 16:40:17 +12:00
Robbie Averill 1bd0b0c138 FIX Update EmailRecipient to look in root directory for templates, optionally, fix other tests 2017-08-22 16:40:17 +12:00
Robbie Averill 8fbe63e34a FIX Remove old upgrade maps, comment failing test (see todo), change publish strategy in UDF test 2017-08-22 16:40:17 +12:00
Robbie Averill 5c9417da21 API Implement cascading deletes API for model relations 2017-08-22 16:40:17 +12:00
Robbie Averill 59827e2011 API Remove UserFormRecipientEmail and use core Email class. Minor test fixes. 2017-08-22 16:40:16 +12:00
Robbie Averill cba7c26950 API Move templates to namespaced class locations in the templates folder 2017-08-22 16:40:16 +12:00
Robbie Averill cdb2259307 FIX Validation related errors in unit tests and EmailRecipient 2017-08-22 16:40:16 +12:00
Robbie Averill 84c8592097 FIX Remove form submission posts to UDFController/Form 2017-08-22 16:40:16 +12:00
Robbie Averill eea60f66f1 FIX Fix CMS css name, remove old showcalendar DateField config, update CountryDropdownField 2017-08-22 16:40:16 +12:00
Robbie Averill 5af348894a FIX Update core API changes, implement last of namespacing in test classes, PSR-4 autoloader 2017-08-22 16:40:16 +12:00
Robbie Averill 32586b6363 Run PSR-2 linting 2017-08-22 16:40:16 +12:00
Robbie Averill cd314d3a3c FIX Namespacing errors and method incompatibilities with parent classes 2017-08-22 16:40:16 +12:00
Robbie Averill 46c3c5b517 FIX Syntax error and last of translation namespacing 2017-08-22 16:40:15 +12:00
Robbie Averill 0008ffaf01 API Implement upgrader cleanup, array declaration changes, class injection, rename some models 2017-08-22 16:40:15 +12:00
Robbie Averill eaf374adc5 API Implement SS4 namespacing, add userforms namespaces 2017-08-22 16:40:15 +12:00
Robbie Averill 2e809de2ea Move files into PSR-4 compatible locations 2017-08-22 16:40:15 +12:00
Robbie Averill c8698d99bd Merge branch '4' 2017-08-22 10:44:04 +12:00
Robbie Averill a0aa714feb Merge branch '4.4' into 4.5 2017-08-22 10:40:37 +12:00
Franco Springveldt f7ff07b828 Merge pull request #648 from creative-commoners/pulls/4.4/php53-compat-fix
FIX Alias object context in closure for PHP 5.3 compat, add test to cover it
2017-08-22 10:31:04 +12:00
Robbie Averill 8d4cd036f7 Merge branch '4' 2017-08-21 15:39:05 +12:00
Robbie Averill d953603bed Merge branch '4.4' into 4.5 2017-08-21 15:35:39 +12:00
Robbie Averill 792d040652 Merge branch '4.3' into 4.4 2017-08-21 15:33:20 +12:00
Robbie Averill dd7e13e7f8 Merge branch '4.2' into 4.3 2017-08-21 15:31:15 +12:00
Robbie Averill fac99f7b6b FIX Alias object context in closure for PHP 5.3 compat, add test to cover it 2017-08-16 13:59:41 +12:00
Robbie Averill c6b30990c8 Merge pull request #552 from hailwood/patch-1
Make getMergeFieldsMap protected
2017-08-11 15:19:27 +12:00
Robbie Averill bf326b86c2 Remove default value field from EditableFileField 2017-08-01 10:05:07 +12:00
Daniel Hensby b068bf65bf
Merge pull request #536 from solnet-aquarium/emailValidation 2017-07-20 10:41:28 +01:00
Robbie Averill ce65dc557f Merge pull request #643 from creative-commoners/pulls/4.4/make-gridfield-injectable
NEW Update GridField creation to be injectable
2017-07-16 19:55:46 +12:00
Franco Springveldt a626d0a66e NEW Update GridField creation to be injectable 2017-07-16 18:39:03 +12:00
Franco Springveldt 1b472cda7b ENHANCEMENT removed needless list from CheckboxGroupField and RadioField 2017-07-12 10:40:53 +12:00
Robbie Averill eb1fb03e28 Merge pull request #627 from creative-commoners/pulls/4.2/submissions-export-fields
FIX submissions export values
2017-06-27 16:08:47 +12:00
Franco Springveldt 1e1b596739 FIX use the correct method for CSV exports and include the full file path 2017-06-27 11:22:08 +12:00
Franco Springveldt 9edc5c3230 Merge pull request #615 from creative-commoners/pulls/4.2/fix-plain-or-html-toggle
FIX Selector for HTML/plain email content toggle. Show preview button for both.
2017-06-27 09:33:53 +12:00
Daniel Hensby 1219927043 Merge pull request #616 from creative-commoners/pulls/4.2/shortcodes-in-email-templates
FIX Ensure HTML email preview content is parsed as HTML including shortcodes
2017-06-26 16:43:32 +01:00
Robbie Averill 67ead916f5 Merge remote-tracking branch 'origin/4' 2017-06-26 18:17:42 +12:00
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