Commit Graph

1591 Commits

Author SHA1 Message Date
Sean Harvey
80facbd81b BUGFIX Ensure merging correctly 2012-04-19 14:26:26 +12:00
Sean Harvey
23c3fb83fb ENHANCEMENT EmailField now uses type="email", which has the benefit of
allowing email validation when using the required="required" attribute.
If using an old browser, the "email" type will fallback to "text"
2012-04-19 14:06:47 +12:00
Robert Curry
842784c8aa ENHANCEMENT: Fixes #7010. Move DisplayFields, FieldCasting and FieldFormatting functions from GridField to GridFieldDataColumns. 2012-04-19 12:44:59 +12:00
Mateusz Uzdowski
a9e7de0cf4 BUGFIX: make UploadField aware of relations to derived classes (os7140)
UploadField was relying entirely on the File::get_class_for_file_extension to
select a class, so it could only create File or Image objects. This
would break the relationships based on derived objects. Also make it
respect the FileField::relationAutoSetting.
2012-04-19 12:18:36 +12:00
Mateusz Uzdowski
47d7392e88 BUGFIX: remove unnecessary write from uploading routine 2012-04-19 12:13:03 +12:00
Mateusz Uzdowski
5d7f6a0d69 MINOR: add some comments to UploadField 2012-04-19 12:13:03 +12:00
Ingo Schommer
7f62ad0f3e Merge branch 'master' into 7094-combine-tree-edit-view 2012-04-18 14:19:55 +02:00
Robert Curry
5603fbe153 ENHANCEMENT: Fixes #7059. Add test for allowedMaxFileNumber to UploadFieldTest. 2012-04-18 14:25:14 +12:00
Ingo Schommer
a393d3937b ENHANCEMENT Anonymous function support in GridField->setFieldFormatting() 2012-04-17 17:11:43 +02:00
Ingo Schommer
ee70e0a5b7 MINOR Fixed returns of Form->unsetValidator() 2012-04-17 11:03:09 +02:00
Sean Harvey
5bb31c4e81 BUGFIX Stop "Insert Link" or "Insert Image" header disappearing inside the HtmlEditorField toolbar
when clicking a link type
2012-04-17 15:47:40 +12:00
Mateusz Uzdowski
59663f9289 BUGFIX: fix up some E_STRICT errors 2012-04-17 11:51:55 +12:00
Ingo Schommer
d44f6b3e1f MINOR Removed deprecated usage of $priority argument in _t() calls 2012-04-15 17:17:17 +02:00
Sean Harvey
d7973ea006 MINOR Don't show warning if running tests 2012-04-15 10:50:20 +12:00
Simon Welsh
f07258f3cf MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
Simon Welsh
f8082e4814 MINOR Add newline to end of files without one 2012-04-15 10:50:19 +12:00
Sean Harvey
7e3a698d56 BUGFIX Fixed missing $properties arg to DatalessField::SmallFieldHolder 2012-04-14 23:40:03 +12:00
Will Rossiter
7df26fd702 BUGFIX: fix missing TabSet template from previous changes and selection group using wrong holder. 2012-04-14 22:08:00 +12:00
Will Rossiter
07d2d5273a ENHANCEMENT: populate FormField:: on the fly based on class name of field rather than requiring explict definition. 2012-04-14 17:36:19 +12:00
Will Rossiter
907568b182 ENHANCEMENT: move hard coded template HTML for composite field and field group out to separate template files. 2012-04-14 17:36:08 +12:00
Ingo Schommer
b025b95ede ENHANCEMENT Lazy-loading image and link dialogs for HtmlEditorField, to avoid unnecessary processing overhead on initial CMS load (also means they'll never get loaded if not required, e.g. in ReportAdmin) 2012-04-12 23:53:12 +02:00
Sam Minnée
977e9f3576 Merge pull request #306 from silverstripe-big-o/report-fixes
API-CHANGE: new GridFieldFooter component
2012-04-11 22:30:10 -07:00
Julian Seidenberg
e9dc610448 API-CHANGE: new GridFieldFooter component 2012-04-12 16:13:47 +12:00
Sean Harvey
2b8e14fdff API CHANGE Fixing CompositeField/SelectionGroup
performReadonlyTransformation and performDisabledTransformation to be
consistent and conform with parent FormField. $trans argument is no longer allowed, just uses
DisabledTransformation or ReadonlyTransformation instead.
2012-04-12 12:24:06 +12:00
Sean Harvey
852ffcf492 MINOR MemberDatetimeOptionsetField::validate() now passes in $validator argument instead of getting it from the form, which is how other FormFields work like CompositeField 2012-04-12 12:23:18 +12:00
Sean Harvey
865cde0c39 BUGFIX FormField::name_to_label() is now declared as static as it was never used as an instance method
API CHANGE FormField::validate() $validator argument is now required for FormField classes
2012-04-12 12:18:55 +12:00
Sean Harvey
8369cded32 MINOR Code formatting in EmailField 2012-04-12 12:17:30 +12:00
Sean Harvey
1e61b76ca8 MINOR ConfirmedPasswordField::validate() now passes in $validator
argument instead of getting it from the form, which is how other
FormFields work like CompositeField
2012-04-12 12:14:42 +12:00
Sean Harvey
859f7add20 MINOR TableField_Item::Fields() now conforms to parent
TableListField_Item::Fields() for E_STRICT compliance
2012-04-12 12:13:22 +12:00
Sean Harvey
42988ecb18 BUGFIX Argument hinting of FormField instance for TabSet::push() to
comply with parent CompositeField::push() for E_STRICT compliance
2012-04-12 12:11:53 +12:00
Sean Harvey
9cf1686786 MINOR Code formatting fixes for CurrencyField 2012-04-12 12:11:22 +12:00
Ingo Schommer
ac45e5b9c0 Merge branch 'integration'
Conflicts:
	admin/css/ie8.css
	admin/css/screen.css
	admin/scss/_style.scss
	dev/install/config-form.html
	dev/install/install.css
	dev/install/php5-required.html
2012-04-11 16:31:12 +02:00
Ingo Schommer
6cd91ff449 Merge pull request #299 from ajoneil/sapphire
---

Conflicts:
	forms/NumericField.php
2012-04-11 15:36:35 +02:00
Andrew O'Neil
716ff9dcfa MINOR: Ensure all form fields have FieldHolder() with identical signature to FormField::FieldHolder(). Fixes E_STRICT warnings. 2012-04-11 18:07:55 +12:00
Andrew O'Neil
4be59a8d45 MINOR: Ensure all form fields Field() method has the same signature as FormField::Field(). Fixes E_STRICT warnings. 2012-04-11 17:33:36 +12:00
Andrew O'Neil
daab8f4cbc MINOR: Consistently use DataObjectInterface for saveInto() on FormField subclasses. Fixes E_STRICT notice 2012-04-11 17:00:57 +12:00
Andrew O'Neil
f811103243 MINOR: Remove redundant setDisabled() methods - this method already exists in FormField. Fixes E_STRICT notice. 2012-04-11 16:17:44 +12:00
Sean Harvey
3e307e00fe MINOR Removing old remains of NumericField.js validation which was
removed in 9f3344b355
2012-04-11 15:55:07 +12:00
Ingo Schommer
a64715beeb BUGFIX Calling tinyMCE.init() in sync with entwine rules to avoid uncached loading interfereing with call order (fixes #6877) 2012-04-10 21:41:00 +02:00
Normann Lou
6671ae7ee9 BUGFIX SSF-124 remove $extraClass in the sortable header of GridField, simply add an 'col-$getName' as the distinguishable class for each column header, so as not to lose the css selector 2012-04-10 17:55:14 +12:00
Normann Lou
26cec90ba7 ENHANCEMENT: SSF-124 make GridFieldSortableHeader to show the extra classes for each of the header field. 2012-04-10 12:04:22 +12:00
Julian Seidenberg
93563021c6 BUGFIX: SSF-168 adding Grid field print header default of null 2012-04-10 11:15:53 +12:00
Ingo Schommer
cf304044b8 Merge branch 'master' into integration 2012-04-10 00:39:29 +02:00
Ingo Schommer
1742b4b742 BUGFIX Fixed loading/saving regressions due to new PJAX logic introduced in e01b0aa3d0 2012-04-10 00:37:14 +02:00
Ingo Schommer
373d9e7b8f Merge branch 'master' into integration 2012-04-09 21:35:30 +02:00
Ingo Schommer
c2f7bf4dcf MINOR Fixed FormField::create() usage 2012-04-09 21:35:07 +02:00
Ingo Schommer
8c5e56fe31 Merge branch 'master' into integration
Conflicts:
	admin/css/screen.css
	dev/install/php5-required.html
2012-04-09 21:10:08 +02:00
Ingo Schommer
a44b67bae2 API CHANGE Moved RequestHandler->isAjax() to SS_HTTPRequest->isAjax() 2012-04-05 23:00:22 +02:00
Normann Lou
a946096e29 MINOR: SSF-168 code convention correction
MINOR: SSF-168 add _t()'s where necessory in GridField print view
2012-04-05 11:02:42 +12:00
Ingo Schommer
40d73127ae MINOR Using late static binding instead of Object::create() calls 2012-04-04 17:10:31 +02:00
Ingo Schommer
6517f4496b Merge pull request #273 from ajoneil/sapphire
---

This allows DataList::create(SiteTree) as equivalent to Object::create(DataList, SiteTree), without
having to have a create() function on DataList.

Required for E_STRICT compliance, as child classes cant override create() if they change the arguments.

DBField::create() is also renamed to DBField::create_field(), as this does not just call the constructor, which all other cases of create() do.

Conflicts:
	tests/model/DateTest.php
	tests/model/DatetimeTest.php
2012-04-04 16:48:16 +02:00
Felipe Skroski
7740bb326a ENHANCEMENT SSF-168 moved print and csv export buttons to the top of the grid 2012-04-04 14:09:52 +12:00
Felipe Skroski
4ffef20b09 ENHANCEMENT: SSF-168 updated print styles to the datagrid 2012-04-04 14:09:52 +12:00
Normann Lou
721184c4b3 MINOR SSF-297 add more available information to GridField print view 2012-04-04 14:07:07 +12:00
Normann Lou
95cdfd7903 BUGFIX destroy $item in the scope of where $item is defined for GridFieldPrintButton->generatePrintData. 2012-04-04 11:29:25 +12:00
Simon Elvery
429ff64d7c Merge branch 'master' of https://github.com/silverstripe/sapphire.git into forms 2012-04-03 15:06:23 +10:00
Simon Elvery
68db977ef1 MINOR: Provide a setter for heading level on HeaderField object. 2012-04-03 15:05:21 +10:00
Normann Lou
d71b04fa19 ENHANCEMENT make gridfield status applied with header filter and header sort before print 2012-04-03 17:04:19 +12:00
Normann Lou
ba02e500e7 FEATURE added GridFieldPrintButton compoonent 2012-04-03 16:57:48 +12:00
Normann Lou
00b904b01c ENHANCEMENT make gridfield status applied with header filter and header sort before export 2012-04-03 16:57:48 +12:00
Julian Seidenberg
98e197aff9 MINOR: SSF-38 renaming the PageUploadField template to HtmlEditorField_UploadField 2012-03-30 13:44:39 +13:00
Julian Seidenberg
ca83d845e1 ENHANCEMENT: SSF-38 added new template for the upload field that is used within a page image insertion dialog box. This upload field is slightly different from the one used in Files. E.g. it uses smaller fonts (h4 instead of h3) 2012-03-29 16:55:51 +13:00
Julian Seidenberg
94e21d18e1 MINOR: SSF-38 i18n of some of the form 2012-03-29 15:09:20 +13:00
Julian Seidenberg
9f9dc25338 ENHANCEMENT: SSF-38 initial rearranging of the insert image form to allow uploads as well as choosing an image from the CMS (and you can pick and choose from both) 2012-03-29 13:34:55 +13:00
Ingo Schommer
f0ee711f52 Merge pull request #275 from halkyon/e_strict_support
First round of fixes for E_STRICT compliance
2012-03-28 02:42:26 -07:00
Sean Harvey
e097f6e1a8 MINOR Fixes to method arguments in core classes for E_STRICT support.
API CHANGE Remove abstract static function and just use static functions
in Authenticator (PHP 5.3+ doesn't support abstract static functions)
2012-03-28 22:41:42 +13:00
Ingo Schommer
f81ad47239 Merge pull request #272 from halkyon/date_fixes
DateField::setValue() with dmyfields sets erroneous date in valueObj
2012-03-28 02:38:03 -07:00
Normann Lou
9e60225064 MINOR : Update core docs to use DataList::create() rather than DataObject::get()/get_one()/get_by_id() where appropriate - Trac#6891 2012-03-27 17:02:18 +02:00
Andrew O'Neil
de2832e65f ENHANCEMENT: Allow Object::create() to be called with late static binding.
This allows DataList::create('SiteTree') as equivalent to Object::create('DataList', 'SiteTree'), without
having to have a create() function on DataList. Required for E_STRICT compliance.
2012-03-27 17:57:42 +13:00
Sean Harvey
c02b4418bb BUGFIX Using DateField "dmyfields" option, if you set empty
day/month/year values, valueObj on DateField will contain erroneous values.
Check that all the value inputs aren't null or empty values BEFORE
calling Zend_Date on the value.
2012-03-27 14:46:09 +13:00
Sean Harvey
4bcd44aee6 ENHANCEMENT GridFieldExportButton now supports dot syntax for column sources through DataObject::relField() 2012-03-25 19:54:38 +13:00
Sam Minnée
5061c8c608 Merge pull request #256 from halkyon/cleanup
GridFieldDeleteAction minor tidy up
2012-03-23 18:09:02 -07:00
Nicolaas
dee3939cf7 BUGFIX: Fix the broken perform readonly transformation which was always showing NO (#6453) 2012-03-24 13:35:19 +13:00
Simon Welsh
fa999ca2de BUGFIX TableListField should only include CSS from the cms if the cms exists. 2012-03-24 11:49:48 +13:00
Sean Harvey
3a91a97f89 MINOR Fixed grammatical error in GridFieldDeleteAction class
documentation
2012-03-23 10:59:17 +13:00
Sean Harvey
98cc25a5fe MINOR Tidy up of class documentation for GridFieldDeleteAction 2012-03-23 10:53:32 +13:00
Sean Harvey
239b4a01f7 MINOR Rename argument to GridFieldDeleteAction to match the property
name $removeRelation
MINOR Tidy up coding standards in GridFieldDeleteAction
2012-03-23 10:51:23 +13:00
Sean Harvey
ff4c82039d MINOR Class documentation for GridFieldDeleteAction 2012-03-23 10:50:17 +13:00
Sean Harvey
4da42f2baf MINOR Revert folderName change to UploadField (already exists on
FileField parent)
2012-03-23 09:22:54 +13:00
Ingo Schommer
0ad6fe7ec1 Merge pull request #250 from sminnee/form-head-request-throws-500
Return 404 rather than 500 on bad actions in requesthandler
2012-03-22 12:45:12 -07:00
Sean Harvey
b5d4234dfd MINOR Correct DropdownField class documentation to include a proper
example using DataList and non-deprecated way of setting the empty value
and string
2012-03-20 15:47:22 +13:00
Sean Harvey
f85f30ac61 BUGFIX DropdownField with SS_Map as the source should use empty string
as the value, and the empty string text as the title, not the other way
around.
2012-03-20 15:34:10 +13:00
Sam Minnee
1d5065f4a7 BUGFIX: Removed reference to non-existence function Form::handleAction(). 2012-03-19 13:10:51 +13:00
Ingo Schommer
161a5ca209 Merge pull request #249 from sminnee/form-head-request-throws-500
BUGFIX: Prevent 500 error when a HEAD request is sent to its action URL.
2012-03-18 15:54:25 -07:00
Sam Minnee
067204d003 BUGFIX: Prevent 500 error when a HEAD request is sent to its action URL. 2012-03-19 09:26:20 +13:00
Simon Welsh
b9ab70a249 BUGFIX Don't try setting the value attribute on DropdownField or its subclasses. 2012-03-17 21:16:25 +13:00
Ingo Schommer
22dc7fd2d8 MINOR Warning about imminent TableField deprecation 2012-03-15 22:31:55 +01:00
Sean Harvey
5ce1dc1822 ENHANCEMENT Allow setting folderName to Upload in UploadField using
setFolderName()
2012-03-14 15:53:04 +13:00
Sean Harvey
54507d7a8f MINOR Fixed coding style in CreditCardField::Field() 2012-03-13 09:47:30 +13:00
Ingo Schommer
2d151b8cfa API CHANGE Deprecated TableListField and ComplexTableField, use GridField instead 2012-03-12 17:26:42 +01:00
Ingo Schommer
b246522c24 MINOR Various fixes to get TableListField and ComplexTableField baseline operational (although usage of GridField is encouraged) 2012-03-12 17:26:40 +01:00
Ingo Schommer
95f1800d80 BUGFIX Resolve local images correctly even with absolute URLs in HTMLEditorConfig_Toolbar, fixed display of remote images (don't try to format the thumbnail, which only works on local images) (fixes #6952) 2012-03-12 16:31:48 +01:00
Ingo Schommer
4fc3aaf939 Revert "ENHANCEMENT Using 'autoresize' TinyMCE plugin in HTMLEditorField default config, in order to save space when no content is entered into the field" - causes artificial loading delay, and doesn't detect height correctly due to floated images in paragraphs. These paragraphs can't be clearfix'ed because they'd become contenteditable (resizeable) elements in IE because of this.
This reverts commit 69a8659a3d.
2012-03-12 16:03:13 +01:00
Andrew O'Neil
199dd648da BUGFIX: Fix errors submitting a credit card field 2012-03-12 10:26:41 +01:00
Ingo Schommer
960e3428b6 MINOR Avoid wrapping GridField row buttons into multiple lines 2012-03-12 10:23:59 +01:00
Ingo Schommer
0d69126152 MINOR Fixed GridField conditional 2012-03-12 09:59:29 +01:00
Ingo Schommer
2ec9de1e59 MINOR Updated GridFieldDetailForm naming 2012-03-12 09:55:33 +01:00
Sam Minnee
7de5bf55e0 API CHANGE: Updated throwExceptionOnBadDataType setter to be standard setThrowExceptionOnBadDataType(), added getThrowExceptionOnBadDataType(). 2012-03-10 14:44:12 +13:00
Sam Minnée
aa83c114a6 Merge pull request #220 from oddnoc/6817-findOrMakeTab
BUGFIX #6817: FieldList.php: findOrMakeTab () fails for nested TabSets
2012-03-09 15:24:28 -08:00