Commit Graph

713 Commits

Author SHA1 Message Date
Sam Minnee
1694546870 API CHANGE: Allow fieldList arguments to Form::loadDataFrom() and Form::saveInto(), for situations where the data passed only applies to a segment of the form. (from r90872)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@90963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:31 +13:00
Sam Minnee
ef5ffe52a1 API CHANGE: Inserting $HiddenFields into a form template will show the input tags of all the hidden fields. (from r90871)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@90962 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:31 +13:00
Sam Minnee
e3fa5cae7f BUGFIX: Fix Form.FieldMap, used when constructing forms that have the HTML explicitly specified.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90851 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 01:14:54 +00:00
Ingo Schommer
233a8fcd85 BUGFIX: was being passed to foreach without a check to see if it's an array or not. (from r86202)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90834 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 00:29:21 +00:00
Ingo Schommer
06f71f6cb5 BUGFIX: Added required javascript files (behaviour, prototype, prototype_improvements) to the Field() method of TreeSelectorField.php (from r84320)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 00:26:57 +00:00
Andrew Short
79773042be API CHANGE: Renamed conflicting classes to have an "SS_" namespace, and renamed existing "SS" namespace to "SS_". The affected classes are: HTTPRequest, HTTPResponse, Query, Database, SSBacktrace, SSCli, SSDatetime, SSDatetimeTest, SSLog, SSLogTest, SSLogEmailWriter, SSLogErrorEmailFormatter, SSLogErrorFileFormatter, SSLogFileWriter and SSZendLog.
MINOR: Replaced usage of renamed classes with the new namespaced name.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90075 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-26 03:06:31 +00:00
Sam Minnee
9a83be9140 Merge branch 'master' of git@github.com:sminnee/sapphire
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90071 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-23 23:26:10 +00:00
Andrew O'Neil
c4e0d45742 BUGFIX: Remove blockquote from tinymce default plugin list - blockquote isnt a plugin in tinymce3.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90051 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-23 02:24:09 +00:00
Andrew O'Neil
8679fd9883 FEATURE: Allow Text/Varchar fields to be configured to differentiate between NULL and empty string. (#4178, petebd)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-23 01:29:55 +00:00
Sean Harvey
d3130e6dfe API CHANGE Fixed change in r89716 to be more semantic with FileIFrameField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89841 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 05:54:12 +00:00
Sean Harvey
7f7e3a0ba3 API CHANGE: TableListField customQuery and customCsvQuery won't automatically include ID, ClassName, and RecordClassName fields (from r87354)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89726 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 02:36:33 +00:00
Sean Harvey
2cc2f41b45 BUGFIX: disabling user ability to upload images into the CMS from their local computer (from r82573)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89716 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 02:26:01 +00:00
Sean Harvey
25e7f4413b BUGFIX Ensure that FileIFrameField gets the proper class, this could be a subclass of File instead
MINOR Make use of dataClass() in FileIFrameField instead of calling the same has_one() method in multiple places
(from r82175)



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89715 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 02:23:14 +00:00
Sean Harvey
e343391bfe MINOR Fixed invalid argument foreach() on CheckboxSetField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89342 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-17 23:33:13 +00:00
Ingo Schommer
6478062ceb BUGFIX Removed 'name' attribute from HeaderField markup - its invalid HTML to put in <h*> elements (#4623)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89333 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-17 00:01:55 +00:00
Sam Minnee
dfd45fb7fd BUGFIX: Fixed diabled image references for edit and delete links in CTF (from r88967)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:39:19 +00:00
Sam Minnee
96e449225e BUGFIX: If a CTF without a show action is made readonly, don't add the show action back. (from r88960)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:39:07 +00:00
Sam Minnee
5ec83b9bd0 BUGFIX: Fixed resolution of amibiguous has_many foreign keys in ComplexTableField to use the same logic as DataObject (from r88945)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:38:57 +00:00
Sam Minnee
5082cd8ffb MINOR removed debugging statement (from r88627)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89184 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:24:35 +00:00
Sam Minnee
3965ac5237 MINOR don't show invalid version links (from r88147)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89181 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:24:09 +00:00
Sam Minnee
7dd6d10cde MINOR added more documentation around SiteConfig. Also wrote unit tests for permissions inheritance off it. (from r86132)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89164 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:53:15 +00:00
Sam Minnee
4ab8055c29 #63 - Stable against restructures (from r84861)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:46:13 +00:00
Andrew Short
1ccdcbac5d API CHANGE: Updated Form->FormAction() to use Controller::join_links() rather than relying on the action parameter (to preserve b/c).
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88991 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 00:02:05 +00:00
Andrew Short
5adfc28a43 BUGFIX: Reset broken file & link flags in HtmlEditorField->saveInto() before determining if a record contains broken links.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88989 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 00:02:04 +00:00
Andrew Short
26ece45bb0 BUGFIX: Stopped HtmlEditorField->saveInto() from dying when encountering a link that cannot be made relative.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88774 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-13 01:45:01 +00:00
Andrew Short
9b4d9993a4 FEATURE: Added SS_HTMLValue to provide a simple wrapper around DOMDocument to allow the manipulation of HTML snippets.
FEATURE: Re-instated broken link highlighting by manually checking all shortcodes in HtmlEditorField->Field(), and adding a class to broken ones.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88510 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:27 +00:00
Andrew Short
f29eceecff API CHANGE #3724: Unified the Link() method to accept an action parameter.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88495 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:16 +00:00
Andrew Short
e533719d06 BUGFIX: Use Link() on the controller to generate to form action path.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88493 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:14 +00:00
Andrew Short
1859ba502b FEATURE: Updated HtmlEditorField to use DOMDocument to more reliably parse image tracking and shortcode link tracking data.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88492 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:13 +00:00
Andrew Short
73b0ea643f ENHANCEMENT #3279: Updated the link inserter to insert a shortcode rather than a plain HTML link.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88491 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:12 +00:00
Andrew Short
264b484e82 ENHANCEMENT: Refactored TreeDropdownField to generate and manage the tree using Hierachy's ParentID data, rather than relying on the client.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88482 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:05 +00:00
Andrew Short
fd7b322ed4 MINOR: Removed un-used HtmlEditorField button generation code that has been replaced with HtmlEditorConfig.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88470 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:06:55 +00:00
Ingo Schommer
a0fd987b29 BUGFIX Filter both 'available' and 'new' languages in LanguageDropdownField for canTranslate() permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88138 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-05 20:40:22 +00:00
Will Rossiter
af9e4f59f5 MINOR: Reverted previous commit
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88112 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-05 03:37:05 +00:00
Will Rossiter
620aa651aa FEATURE: added extend() call to enable FieldHolder() html to be customized via extensions.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88104 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-05 02:17:19 +00:00
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
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