Commit Graph

72 Commits

Author SHA1 Message Date
Damian Mooyman
b0ba2015d9 [ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField 2016-08-15 15:53:21 +12:00
JorisDebonnet
72a014d933 Allow '0' in DropdownField (#5199)
Display falsey values as option titles when they have been included.
2016-04-19 17:40:14 +12:00
torleif
122784b1cb FIX OptionsetField input has required #4901 2016-01-12 12:22:24 +13:00
Sam Minnee
3ee8f505b7 MINORE: Remove training whitespace.
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:15:54 +13:00
Damian Mooyman
ad42f802c4 BUG Fix duplicate HolderID on TreeDropdownField 2015-10-06 12:54:35 +13:00
Damian Mooyman
560f9a6e39 API respect custom attributes on OptionsetField and CheckboxSetField 2015-07-10 14:49:05 +12:00
Damian Mooyman
0abacaead6 Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	admin/code/LeftAndMain.php
	forms/EmailField.php
	forms/Form.php
	forms/HeaderField.php
	forms/LiteralField.php
	forms/PasswordField.php
	forms/TextareaField.php
	forms/TreeDropdownField.php
	model/DataObject.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/DataObjectTest.php
2015-06-17 11:24:25 +12:00
Daniel Hensby
6be0488731 FIX TreeDropdownField doesnt change label on unselect 2015-06-11 16:14:08 +01:00
Damian Mooyman
dff65867cc Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php
2015-02-20 10:17:19 +13:00
Damian Mooyman
1db08bac88 BUG Fix FormAction title encoding
BUG Fix TreeMultiSelectField using the wrong label
BUG Fix encoding of selected title on TreeDropdownField
BUG Fix DataDifferencer trying to compare non-comparable fields (non-dbfield objects)
BUG: Fix issue with TreeMultiSelectField not saving
BUG: Fix issue with GridFieldPrintButton
ENHANCEMENT Instead of using multiple api calls to encode dbfield values, delegate this operation to the individual fields via forTemplate
Instead of using a new API to communicate html encoding to treeselect, just ensure all content is HTML encoded, and enable html_titles in jstree.
2015-02-13 15:50:45 +13:00
Daniel Hensby
89c14d079d Making TreeMultiSelectField consistent with parent class
NEW TreeDropdownField sanatiser helper added
Use config for default_cast of objects
FIX Determine if Diffed value should be escaped
Forcing casting for core DB fields
Fixing permissions labels
2015-02-13 11:12:30 +13:00
Daniel Hensby
d68435e978 FIX SelectionGroup no longer shows empty FieldLists 2015-02-06 11:00:00 +00:00
Daniel Hensby
6103d66116 Fix issue where TreeDropdownField loses value on show/hide
Fixes https://github.com/silverstripe/silverstripe-cms/issues/1157
2015-01-27 11:53:53 +00:00
Will Rossiter
218ef0b599 Merge commit 'ec0c259' into 3
* commit 'ec0c259':
  BUG: Reinstate tab and form focus states (fixes CMS #732 and #817)
2015-01-07 14:26:19 +13:00
Naomi Guyer
ec0c259c17 BUG: Reinstate tab and form focus states (fixes CMS #732 and #817)
* Added methods to track and restore field focus
* Added a trigger event when tabstate reset

Update LeftAndMain.EditForm.js
2014-10-26 14:21:47 +13:00
Damian Mooyman
2c24d51c0b Revert #3358 2014-08-04 12:13:19 +12:00
Sean Harvey
8c56e54a47 Fixed usage of .XML with .ATT for attributes in CheckboxSetField 2014-08-04 10:18:34 +12:00
Sean Harvey
b2dac644a0 BUG Fixed escaping of name/value in options of form fields
DropdownField was currently escaping options, but CheckboxSetField and
OptionsetField were not. This fixes them to be consistent.
2014-08-04 09:55:35 +12:00
Sean Harvey
9048eab4a2 Merge branch '3.1' 2014-02-12 11:06:54 +13:00
Damian Mooyman
1c7af2fd04 BUG Fix missing description element on FieldGroup_holder.ss 2014-02-10 10:38:00 +13:00
Ingo Schommer
0d7e9a9692 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	_config/routes.yml
	docs/en/topics/datamodel.md
	forms/DropdownField.php
2014-02-04 08:19:04 +13:00
Will Rossiter
079b29bfff FIX Add missing extraClass to FieldGroup_holder
FieldGroup_holder doesn't use FieldGroup
2014-01-28 20:00:20 +13:00
Simon Welsh
39d42e4ea3 Merge branch '3.1' 2014-01-09 08:22:47 +13:00
Will Rossiter
770e23f8e1 Merge pull request #2270 from ARNHOE/3.1-updatedfieldgroup
BUG Updated fieldgroup class and example code
2013-12-20 19:14:21 -08:00
Nathan J. Brauer
fee54c75f0 API: Change DropdownField::getSource() to not return the emptyString value. 2013-10-18 11:16:27 +13:00
Will Rossiter
1c983bc16d API: LookupField::Field now returns an HTMLText instance.
Moved LookupField into a template, removed getSource() as the DropdownField getSource() has been simplified to just a getter
2013-10-18 10:28:17 +13:00
Ingo Schommer
60fc7e5346 Merge remote-tracking branch 'origin/3.1' 2013-10-06 19:07:39 +02:00
Tom Densham
37e032df86 API: Change CreditCardField to use AttributeHTML 2013-10-03 15:26:31 +01:00
Tom Densham
d79d50770c FIX: Make CreditCardField use template 2013-10-03 10:51:39 +01:00
Ingo Schommer
7ae75c1a89 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	forms/HtmlEditorField.php
2013-08-16 13:37:44 +02:00
Ingo Schommer
eb17cf3eb9 Merge pull request #2275 from ARNHOE/3.1-updatefieldgroupstyle
BUG Fieldgroup styling
2013-08-15 12:14:05 -07:00
Ingo Schommer
6352201738 No <label for> on OptionsetField/CheckboxSetField holder
It produces invalid HTML since the "for" attribute doesn't
map to any HTML input field. Each individual checkbox or radio button
input element has its own <label for>
2013-08-13 18:05:11 +02:00
Arno Poot
81843c7fb8 Fieldgroup Warped $title in a if 2013-08-05 18:12:35 +02:00
Arno Poot
fefb7af0f5 BUG Fieldgroup styling 2013-07-28 15:52:39 +02:00
Arno Poot
b68cd6610c Updated fieldgroup class and example code 2013-07-26 16:01:24 +02:00
Hamish Friedlander
0a79ac3592 Merge branch 'origin/3.1'
Conflicts:
	templates/forms/CheckboxSetField.ss
	templates/forms/FormField_holder.ss
	templates/forms/OptionsetField.ss
2013-07-19 16:25:38 +12:00
ARNHOE
2427d57fa5 Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
Ingo Schommer
0c4ec4708b API Using $HolderID for form field container templates
Replaces duplicate $ID usage.
See https://github.com/silverstripe/silverstripe-framework/pull/1873
2013-05-31 19:46:11 +02:00
Will Rossiter
ca87b8b794 API: Form Field ID attribute should follow HTML specification
Fixes: http://open.silverstripe.org/ticket/4431.

Changes Form and Form Field classes to make use of Convert::raw2htmlid() which follows http://www.w3.org/TR/REC-html40/types.html#type-cdata.

Introduces a FormTemplateHelper class to assist in these sort of updates in the future.
2013-05-26 11:11:55 +12:00
uniun
c48eca1615 The MAX_FILE_SIZE field must precede the file input field.
More here: http://php.net/manual/en/features.file-upload.post-method.php
2013-05-02 11:15:55 +03:00
Hamish Friedlander
7efae6b95f Merge remote-tracking branch 'origin/3.0' into 3.1 2013-02-18 14:31:57 +13:00
Ingo Schommer
f8bbc0a726 BUGFIX Escape HTML in DropdownField and ListboxField
Fixes reflected XSS in Group titles when using
in group selections (e.g. in "New Member" form).
2013-02-17 23:27:15 +01:00
Ingo Schommer
1ca3883a76 NEW Tooltip and inline help text support for CMS form fields 2012-12-14 01:58:04 +01:00
Ingo Schommer
6f9d01f621 API FormField->setDescription() visible in default template
Renders into <span class="description"> instead of "title" attribute
2012-12-14 01:58:04 +01:00
Ingo Schommer
bcbf4636fc BUG Remove .ss-tabset class from CMS tabs to prevent rogue ajax load (#7980)
The existence of .ss-tabset triggers JS which applies $.tabs(),
and in turn interprets the first available link as the tab navigation.
jQuery UI subsequently tries to ajax-load this link, which is not
desired. Instead, $.tabs() should *only* be applied to a container
DOM element with .cms-tabset applied.
2012-11-01 00:25:13 +01:00
Damian Mooyman
06676175ed FIXED: Issue where messages attached to checkbox fields would not be displayed. 2012-09-03 18:21:11 +12:00
Ingo Schommer
2e21574988 NEW FieldGroup_DefaultFieldHolder template
As a replacement for the FieldGroup->subfieldParam
setting available in 2.4. Usage through FieldGroup->setTemplate().
2012-08-27 15:41:56 +02:00
Ingo Schommer
ce2d31b060 BUG Consistently self-closing form field tags (#7557)
This is reverting templates back to pre-3.0 conventions,
which were dominated by XHTML templates.
HTML5 allows both self-closing and unclosed tags,
so opting for self-closing to achieve maximum compatibility.
2012-08-10 10:27:33 +02:00
Ingo Schommer
6c1f7997a4 ENHANCEMENT HTML titles in TreeDropdownField
HTML in tree nodes is already used to render page icons via SiteTree->TreeTitle.
In order to select the initial value correctly via HTML5 data attributes,
we need to encode any HTML values.
2012-06-13 16:04:14 +02:00
Andrew Short
9e4b526213 MINOR: Include the title attribute on tree and readonly fields. 2012-06-13 13:19:16 +02:00