Commit Graph

50 Commits

Author SHA1 Message Date
Damian Mooyman
e14f743bf0 Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12: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
Damian Mooyman
eb069e605d Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Ingo Schommer
bea1b9002d Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	control/HTTP.php
2013-02-26 13:28:35 +01:00
Daniel Hensby
b7e34bd54c Removing redundant function
At the moment form actions (buttons) have the classes 'action action' as default. This is because the extraClass function adds 'action' and then calls the parent method. The parent then includes the $this->Type() ('action') again.

So I've remove this overloading of extraClass
2013-02-18 16:38:15 +00:00
Simon Elvery
775567d427 Allow <button type='submit'> for the benifit of IE<=7 2012-12-21 16:19:43 +01:00
Ingo Schommer
e2f073f38a Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
Ingo Schommer
a9fa281723 Form field docs update (fixes #7521) 2012-06-26 15:03:11 +02:00
Will Rossiter
78c15ea882 BUGFIX: Fix correct input type for ImageFormAction replaces.
ImageFormAction is deprecated, using the new API results in a submit input rather than an image input being generated. Added hasAttribute helper to FormField as well as test coverage.
2012-06-13 09:57:54 +02:00
Simon Welsh
f8082e4814 MINOR Add newline to end of files without one 2012-04-15 10:50:19 +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
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
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
Sam Minnee
1fd8d19e28 API CHANGE: FormAction::FieldHolder() now returns just the Field(), so that a FieldList::forTemplate() returns a sensible result for an action list. 2012-03-08 10:02:57 +13:00
Ingo Schommer
e28afcacc5 MINOR Added FormAction->setUseButtonTag() and getUseButtonTag() 2012-02-17 13:35:54 +01:00
Ingo Schommer
454b89f2bb BUGFIX Fixed FormAction.ss template when used with <button> tag 2012-02-17 13:35:54 +01:00
Ingo Schommer
7602d081a2 ENHANCEMENT Fluent interface in Form API by returning instance from all setters 2012-02-17 13:35:26 +01:00
Ingo Schommer
d678c12ac8 API CHANGE Removed FormAction->extraData() and $extraData constructor argument, use setAttribute() instead 2012-01-02 16:58:46 +01:00
Ingo Schommer
b5421d9598 ENHANCEMENT Allowing custom attributes in (most) FormField implementations, which allows for HTML5 data attributes 2012-01-02 16:48:14 +01:00
Ingo Schommer
a6148c33da MERGE Using FormField->template in most fields 2012-01-02 16:48:14 +01:00
Sean Harvey
9e548f501e API CHANGE FormField::Field() and FormField::FieldHolder() now render into templates on each FormField instead of creating HTML from PHP 2012-01-02 16:48:13 +01:00
Ingo Schommer
ce8e72cf0e MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
Ingo Schommer
a0dd4ff8f0 MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc (from r107725)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112608 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:55:22 +00:00
Ingo Schommer
00d19cc3d1 BUGFIX: FormAction input tag attributes were being doubly-escaped. (from r100407)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105561 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:50:37 +00:00
Ingo Schommer
792deb3bad MINOR Use addExtraClass() in FormField::__construct() instead of direct assignment (see #4607, thanks Tjofras) (from r97481)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 21:19:01 +00:00
Ingo Schommer
227bfffc0b ENHANCEMENT: Added TabIndex to FormActions. Ticket: #4905. PATCH: via keeny (from r97011)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102417 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:30:41 +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
Andrew O'Neil
60f75c5ca4 Merged changes from 2.3 branch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71172 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-01 23:49:53 +00:00
Ingo Schommer
d26f08b481 MINOR merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@67465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-04 22:38:32 +00:00
Ingo Schommer
fdeaececb1 BUGFIX Respecting $dontEscape in FormAction
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65335 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 23:21:50 +00:00
Ingo Schommer
41075078fd BUGFIX Fixed title-handling in FormAction, regression from r64410
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64879 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-29 16:12:23 +00:00
Sean Harvey
a78b5a2efb BUGFIX Fixed extra class addition on various FormField->Field() methods
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64601 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-21 20:58:11 +00:00
Sean Harvey
1611deb019 MINOR Convert::raw2att() isn't required because FormField->createTag() already does this
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64550 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 10:03:20 +00:00
Sean Harvey
b8ef87d24a MINOR phpDoc comment error fix
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64411 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 11:50:55 +00:00
Sean Harvey
3e13bd8307 ENHANCEMENT Made use of createTag() on FormAction->Field()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64410 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 11:50:13 +00:00
Ingo Schommer
d2e5662d47 MINOR Formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64014 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-09 20:27:01 +00:00
Hayden Smith
130ecfe5aa Merged [47044]: Introduces modifications to Sapphire's form handling that allows it to ignore fields marked as Disabled when saving the contents of a form's fields to a DataObject.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60469 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 02:58:48 +00:00
Ingo Schommer
ad4d506f82 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60287 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:14:48 +00:00
Ingo Schommer
0365bc113f (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59969 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 06:54:59 +00:00
Ingo Schommer
60860cc1b9 MINOR Unified @package PHPdoc (added where missing, removed duplicates)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-15 13:33:53 +00:00
Sam Minnee
41a11b277e Improved API documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47799 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 00:34:18 +00:00
Sam Minnee
b1d2e3906b API Documentation updates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-09 04:18:36 +00:00
Normann Lou
83eb3c3110 inform-merges
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45483 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-23 02:00:24 +00:00
Normann Lou
9ce552a6dc inform-merge:
r43558: FEATURE: respect $extraClass
BUGFIX: overloaded FieldHolder?() to avoid DefaultFieldHolder?.ss usage 

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45475 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-23 01:21:19 +00:00
Ingo Schommer
0da5773278 reverted "BUGFIX: overloaded FieldHolder() to avoid DefaultFieldHolder.ss usage"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43563 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-18 01:44:37 +00:00
Ingo Schommer
eeb79fde9c FEATURE: respect $extraClass
BUGFIX: overloaded FieldHolder() to avoid DefaultFieldHolder.ss usage

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43559 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-18 01:06:21 +00:00
Ingo Schommer
ef54473d1b elofgren: Add 'extraClass' parameter to FormAction? and use it to assign the 'delete' CSS class to the 'Unpublish' and 'Cancel draft changes' buttons so that their background turns red on hover.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41820 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 23:43:02 +00:00
Sam Minnee
f199dc6cd4 Added docblock headers and removed notice-level errors
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40912 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-27 05:13:43 +00:00
Hayden Smith
4a5d9b03f8 Moved Sapphire module to open source path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 10:40:28 +00:00