Commit Graph

628 Commits

Author SHA1 Message Date
Sean Harvey
b77d088d47 Merged in parent::__construct() additions from branches/2.3 - r83580 and r83587
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86676 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-18 03:02:19 +00:00
Geoff Munn
69563972e5 MINOR FIX: columns quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-17 00:18:43 +00:00
Geoff Munn
41b700d163 MINOR FIX: backticks converted to quotes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86523 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-17 00:16:12 +00:00
Ingo Schommer
f86bc6f715 ENHANCEMENT Added TableListField->paginationBaseLink
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86338 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-15 04:11:13 +00:00
Sean Harvey
1912ca960b MINOR #3629 FileIFrameField If user clicks "Attach file" or "Replace file" without a source file, validation message will appear above the form
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86129 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-11 03:14:55 +00:00
Ingo Schommer
47db2ab55e BUGFIX Detecting DataObjectSet for readonly transformations in CheckboxSetField (thanks martijn, #4527)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@85758 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-05 00:05:02 +00:00
Normann Lou
5a39ad8a94 BUGFIX: merge r 85079 from branches/iss to fix Payment Validation of php side when submit a OrderForm
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@85130 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-25 01:51:56 +00:00
Sean Harvey
fc372b9598 BUGFIX SelectionGroup should include jQuery and jQuery livequery plugin when it's used or it will fail
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84976 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-21 03:22:52 +00:00
Andrew O'Neil
66543e6002 NOTFORMERGE: Merged 84085 from 2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84089 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-10 04:32:39 +00:00
Mateusz Uzdowski
e1ea8759be ENHANCEMENT ImageField now shows only images and folders under the 'From the File Store' tree
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@83346 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-31 00:46:07 +00:00
Ingo Schommer
77ab3e6038 MINOR PHP Notice bugfix in TableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82096 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-17 02:27:13 +00:00
Ingo Schommer
946025adb9 API CHANGE Removed TableField->FieldSet() and TableField->SubmittedFieldSet(), please use Items() and TableField_Item->Fields() instead (merged branches/2.3-nzct)
BUGFIX Fixed re-loading of unsaved TableField form data (e.g. after a validation error). The (now removed) method SubmittedFieldSet() was setting incremental temporary identifiers ("new1", "new2", etc), which wasn't picked up by Items() (merged from branches/2.3-nzct)
BUGFIX Using $this->value instead of $_POST to process submitted data in TableField (merged from branches/2.3-nzct)
BUGFIX TableField validation logic iterates over TableField_Item instances to get all formfields, rather than creating their own set in SubmittedFieldSet()
MINOR Removed repitition of temporary Form generation in TableField by generateTableFieldItem() method (merged from branches/2.3-nzct)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82089 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-17 02:09:27 +00:00
Ingo Schommer
99d6f2241f MINOR Simplified TableField->sortData() code structure (no logic changes) (merged from branches/2.3-nzct)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82079 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-17 00:17:43 +00:00
Ingo Schommer
bc07a4644e MINOR Simplified TableField->saveData() code structure (no logic changes) (merged from branches/2.3-nzct)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82078 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-17 00:17:21 +00:00
Ingo Schommer
98cc45291b MINOR Code formatting in TableField (merged from branches/2.3-nzct)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82077 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-17 00:16:52 +00:00
Ingo Schommer
d3ff09df03 MINOR Removing TableField->delete(), was superseded by TableListField_ItemRequest->delete() a while ago (merged from branches/2.3-nzct)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82076 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-17 00:16:17 +00:00
Ingo Schommer
9a43bbc1ed ENHANCEMENT TableField_Item->createFields() returns FieldSet instead of DataObjectSet (merged from branches/2.3-nzct)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82075 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-17 00:15:39 +00:00
Ingo Schommer
92aecd6ab6 MINOR TableField documentation (merged from branches/2.3-nzct)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82074 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-17 00:13:42 +00:00
Ingo Schommer
a17f6e120b MINOR Improved naming in TableField->saveInto() (merged from branches/2.3-nzct)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82073 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-17 00:12:56 +00:00
Ingo Schommer
e6ade3d64b BUGFIX Including NumericField?.js in NumericField?, was previously extracted from CalendarDateField?.js (merged from branches/2.3-nzct)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82067 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-16 23:58:42 +00:00
Ingo Schommer
485eca829b BUGFIX Removed tabindex settings on DMYDateField, they were messing up the tab order in day/month/year fields (merged from branches/2.3-nzct)
BUGFIX Removed "numeric" class on day/month/year fields in DMYField, the auto-magic NumericField? javascript resetting thats triggered onkeyup() is just a bit too much for its own good (merged from branches/2.3-nzct)
BUGFIX Removed hiddenfield dependency on DMYDateField, save into three distinct input fields and validate accordingly. All underlying logic already works with this notation. (merged from branches/2.3-nzct)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82062 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-16 23:54:25 +00:00
Ingo Schommer
11b30e8db9 MINOR Moved NumericField? javascript logic from CalendarDateField?.js into new NumericField?.js. Removed unused DMYCalendarDateField javascript logic, the field behaves just fine with standard input fields and no auto-focus magic on the input fields. (merged from branches/2.3-nzct)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82061 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-16 23:52:35 +00:00
Ingo Schommer
8a20d5c1ad ENHANCEMENT Added TableField?->autoRelationSetting to allow for automatic saving into relationships (similiar to ComplexTableField? implementation) (merged from branches/2.3-nzct)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82060 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-16 23:49:32 +00:00
Sean Harvey
82a68dd3bd MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@81997 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-16 03:44:15 +00:00
Sam Minnee
212765ae5c MINOR: Made extract() call a little tighter.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@81381 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-08 23:04:43 +00:00
Ingo Schommer
cf302011b8 BUGFIX Fixed Form->handleField() to first look for fieldByName() before falling back to dataFieldByName(). This was necessary for tabs and formfields having the same name, e.g. "Members" in the SecurityAdmin class. We have to ensure to return the data field instead of the (non-datafield) tab.
MINOR Added documentation about URL handling to Form

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@81130 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-06 22:06:42 +00:00
Ingo Schommer
4a531820cd BUGFIX Accepting dot-notation in TabSet->fieldByName()
BUGFIX Using fieldByName() instead of dataFieldByName() in Form->handleField() to allow rendering of nested tabs through a URL

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@81128 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-06 21:53:50 +00:00
Ingo Schommer
fcc6948e79 BUGFIX Setting brokenOnConstruct to FALSE in CompositeField::__construct() - it skips a constructor, hence breaking request handling (and therefore direct field access through /Form/Field/MyCompositeField/FieldHolder
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@81127 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-06 21:48:12 +00:00
Sean Harvey
1b1809f1a2 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80873 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-02 07:18:18 +00:00
Sam Minnee
f41e2b474c ENHANCEMENT: Improved performance of admin/assets area.
BUGFIX: Fixed bug in 'sake interactive' error handling.
BUGFIX: Fixed bugs with MSSQL and Windows support.
API CHANGE: Added FormAction::setButtonContent()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80782 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-01 22:27:18 +00:00
Rainer Spittel
ca4ec1af03 ENHANCEMENT: enabled saveInto to use the setter method when available instead of passing through the form field values directly to the money class.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80521 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-30 03:16:28 +00:00
Sam Minnee
73cfe3ab84 API CHANGE: Added increase_time_limit_to(), which respects safe_mode.
API CHANGE: Added no-arg option to increase_memory_limit_to()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80241 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-28 02:36:46 +00:00
Sam Minnee
66b25f1e62 BUGFIX: Fixed CSRF warning in image form after selecting a folder.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80237 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-28 01:17:20 +00:00
Sam Minnee
c0c72e4c53 BUGFIX ajshort: Ensure that CSRF security token settings are passed from parent controllers/forms into child forms.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80225 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-27 08:48:42 +00:00
Sam Minnee
9069d5ae46 MINOR #3399: Removed last references to DefaultFieldHolder.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80220 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-27 07:00:01 +00:00
Sam Minnee
6bcabcbe46 BUGFIX #4306 simon_w: Fixed ConfirmedPasswordField::setValue()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80192 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-27 04:00:10 +00:00
Normann Lou
96fac4432a MINOR: add document for ConfirmedPasswordField::setChildrenTitles().
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79852 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-23 07:47:45 +00:00
Normann Lou
ae864ba751 APICHANGE: add function ConfirmedPasswordField::setChildrenTitle() which can set each child of the field a customised title.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79851 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-23 07:46:12 +00:00
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