Commit Graph

590 Commits

Author SHA1 Message Date
Normann Lou
72a6a4cbc3 FEATURE: roll back r79604 which is to make a ToggleCompositeField able to save back a boolean value if its name is a boolean field of the related object. the reason is this feature is not necessary cos SelectionGroup address the same thing.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79616 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-19 02:38:33 +00:00
Normann Lou
54a79cf9f3 FEATURE: make a ToggleCompositeField able to save back a boolean value if its name is a boolean field of the related object.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79604 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-19 01:38:34 +00:00
Normann Lou
cd59a9b1d7 MINOR: added $extraClass of a hidden field to its rendered html
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79603 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-19 01:36:09 +00:00
Normann Lou
1a32847855 BUGFIX: check isset($variable) before using $variable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79602 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-19 01:34:06 +00:00
Sam Minnee
c52f67aae5 MINOR ajshort: Replaced usage of the deprecated split() function with preg_split().
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79568 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-18 09:34:17 +00:00
Sam Minnee
301989d203 BUGFIX #3922 simon_w: Perform form validation after the clicked button has been set.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79567 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-18 08:22:30 +00:00
Sean Harvey
6c754d29e9 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79438 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-17 11:36:49 +00:00
Sean Harvey
c5ef811b94 MINOR Add folder/upload links weren't being hidden properly in IE - this is for a feature that is disabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79369 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-16 22:46:06 +00:00
Ingo Schommer
b7835f3721 API CHANGE DropdownTimeField uses same timeformat as parent class TimeField: "g:ia" instead of "H:i a"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79358 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-16 07:03:53 +00:00
Ingo Schommer
204620b99d BUGFIX Conditionally setting and getting NULL values in TimeField->setValue()/dataValue(). Previously overriding a TimeField with an empty value wasn't possible.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79357 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-16 07:03:17 +00:00
Ingo Schommer
efb6f0ceaf API CHANGE TimeField doesn't internally store value as "Y-m-d g:ia" (including date), but only as "g:ia"
BUGFIX Allowing TimeField and subclasses to be set to NULL through setValue()
BUGFIX Added TimeField->dataValue() to apply same conversion as setValue()
MINOR Added TimeFieldTest

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79355 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-16 06:39:57 +00:00
Sam Minnee
ab9c826ba2 BUGFIX: Fixed TableListField SQL generation so as not to add redundant duplicate columns. This builds on the change made in r50945, and keeps the behaviour the same as that, but note that r50945 removed the ability to include columns selected from a joined table, which was the original purpose of this code block.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79312 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-16 03:05:15 +00:00
Sean Harvey
0a89009b73 MINOR Removed $rows variable from HtmlEditorField - this gets inherited from TextareaField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79213 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-15 05:17:48 +00:00
Sean Harvey
9c1ef3cd15 ENHANCEMENT Added caption field to HtmlEditorField for settting caption text (optional) on an image
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-15 05:02:00 +00:00
Sean Harvey
362931b6f2 BUGFIX Renamed thumb strip field "Image" to "FolderImages" to avoid ID collisions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-15 03:18:32 +00:00
Sean Harvey
26606fd01d BUGFIX MSSQLDatabase returns strange formatted Datetime values, removed hacks from DateField and PopupDateTimeField and put it in DataObject::__construct() so that it fixes the problem at the source
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-11 07:18:10 +00:00
Sam Minnee
7712c5de49 BUGFIX #4001 rndmerle: Added onblur validation to textarea.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78568 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-08 00:45:26 +00:00
Sam Minnee
ac316f6c1d BUGFIX #3946 ilyabr: Allow multiple forms containing EmailFields on the same page.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78565 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-08 00:41:06 +00:00
Sam Minnee
8cf4986397 BUGFIX #3916 bribaudo: Don't throw an error on HTMLEditorField save if a link is empty.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78563 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-08 00:34:58 +00:00
Sam Minnee
710bb89396 BUGFIX #3814 bgribaudo: Don't throw an error on validation if no validator set
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78560 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-08 00:27:07 +00:00
Ingo Schommer
da758f9f6e ENHANCEMENT Using try/catch blocks in ComplexTableField->saveComplexTableField() to catch any ValidationExceptions and terminate the saving process
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78255 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-02 06:12:10 +00:00
Ingo Schommer
0298ee7d7a MINOR Fixed merge error from r78095 (reverted commit in TableListField made in r77298)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-02 01:37:53 +00:00
Sean Harvey
8b81dbaa75 MINOR Explicitly set ListboxField::$multiple to be a boolean, added phpDoc to support this
MINOR Added proper phpDoc for ListboxField::__construct() arguments
MINOR Removed $source property on ListboxField. This class inherits from DropdownField, and should inherit it's source propery instead



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78186 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-01 23:37:03 +00:00
Sean Harvey
10e0f6f09b Reverted r78129
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-01 23:09:03 +00:00
Sam Minnee
30517119d4 ENHANCEMENT: Improve TableListField query generation, so that it checks whether the DataObject has a database field, rather than just checking to see if it *doesn't* have a field or method.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78153 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-31 11:07:28 +00:00
Sam Minnee
f8fff9709d ENHANCEMENT: Added LiteralField::setValue() so that so that LiteralField is more compatible with other field types.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78152 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-31 11:01:30 +00:00
Sean Harvey
4da2743994 MINOR If a FormField hasn't called parent::__construct() properly, throw an error before attempting to call ClassInfo::ancestry() on a NULL value
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78129 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-29 02:11:41 +00:00
Sean Harvey
838b6f3785 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78095 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-28 07:08:23 +00:00
Sean Harvey
ee2771e99a BUGFIX Slice of extra "OO" if SQL server attempts to set value in DateField
BUGFIX Don't attempt to use JS validation on DateField is javascript handler is "none"


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78065 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-28 04:06:14 +00:00
Ingo Schommer
4a9b100e31 MINOR Fixed PHP notice errors in MoneyField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77906 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-27 00:59:07 +00:00
Sean Harvey
60c5570bf8 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77817 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 02:19:50 +00:00
Ingo Schommer
afbac71d31 MINOR Formatting in MoneyField, added @todo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77791 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 01:08:47 +00:00
Ingo Schommer
b478c8be34 FEATURE Added MoneyField as a form field to edit Money values
ENHANCEMENT Using MoneyField in Money->scaffoldFormField()
BUGFIX Fixed Money->setValue() to respect $value parameter over $record to avoid wrongly updated values from stale $record values instead of new $value

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77772 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-25 22:21:02 +00:00
Sean Harvey
75ba6a1ab9 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77764 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-25 06:59:21 +00:00
Sean Harvey
bb5eff8bed BUGFIX Ensure that any white space is stripped in FieldSet::dataFieldByName() and FieldSet::fieldByName()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77650 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 10:18:15 +00:00
Sean Harvey
c4071d3521 MINOR Code formatting fix in FieldSet
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77649 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 10:11:03 +00:00
Julian Seidenberg
8afb2c131c BUGFIX: corrected datetime output when using 12-hour time values returned from SQLServer databases
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77593 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 02:00:50 +00:00
Ingo Schommer
90ebeaf741 API CHANGE Automatically using DBField->Nice() in tabular view of TableListFields (and subclasses like ComplexTableField) instead of using the scalar value. This means for example values casted as Boolean will render as "Yes"/"No" rather than "1"/"0"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77549 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 04:48:24 +00:00
Sean Harvey
2a66b5a8e1 API CHANGE Removed @deprecated 2.3 method FieldSet::insertBeforeRecursive(): Please use FieldSet::insertBefore() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77401 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:53:30 +00:00
Sean Harvey
452c3294b0 API CHANGE Removed @deprecated 2.3 method Form::resetData(): Please use Form::resetField() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77399 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:45:50 +00:00
Sean Harvey
1b84cdd7e4 API CHANGE Removed @deprecated 2.3 class HiddenFieldGroup
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77397 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:41:07 +00:00
Sean Harvey
55bcfbe1a1 API CHANGE Removed @deprecated TypeDropdown class: Please use a DropdownField instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77395 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:37:19 +00:00
Sean Harvey
a9370a26f9 API CHANGE Removed @deprecated 2.3 class AjaxFormAction - this doesn't do anything special. Please create your own ajax on FormAction instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77393 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:22:18 +00:00
Sean Harvey
071960d196 API CHANGE Removed @deprecated 2.3 ReportField class and JS - this is a relic of DataReport which is now gone
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77382 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 06:33:26 +00:00
Sean Harvey
fb6cb44c4e API CHANGE Removed @deprecated 2.3 method CompositeField::insertBeforeRecursive(): Please use CompositeField::insertBefore() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77356 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 05:11:50 +00:00
Sean Harvey
1122e42d35 API CHANGE Removed @deprecated 2.3 method Form::loadNonBlankDataFrom(): Please use Form::loadDataFrom() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77354 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 05:07:06 +00:00
Sean Harvey
e768d955df ENHANCEMENT #3677 Added more rules for escaping reserved characters in XML to their proper entities e.g. ' => '
BUGFIX When exporting data from TableListField to a CSV via TableListField_Item->Fields(), don't convert the values to XML
MINOR Added test class ConvertTest with tests for various Convert functions



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77298 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 03:09:50 +00:00
Sean Harvey
f7a974ccd4 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77245 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-19 10:32:06 +00:00
Sean Harvey
0f237b0c57 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77141 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-19 02:44:58 +00:00
Ingo Schommer
eeef1f6885 BUGFIX Moving FileIFrameField javascript requirements from __construct() into Field() - otherwise they will be cleared when used in a javascript popup
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77094 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-18 20:55:48 +00:00