Commit Graph

305 Commits

Author SHA1 Message Date
Sam Minnee
0bd9bc4ff8 Merged changes from 2.2.2-assets - everything except the asset refactoring
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 02:51:33 +00:00
Sam Minnee
b5001bc906 Allow object-methods to be used as columns in TableListField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60448 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 00:12:29 +00:00
Hayden Smith
1220f6d86d Merged [47039]: Introduces custom actions to TableListField and ComplexTableField. By default, the show, edit and delete actions are included.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60433 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:24:54 +00:00
Ingo Schommer
34479223fa MINOR Moved ScaffoldComplexTableField to separate file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60401 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:41:00 +00:00
Hayden Smith
70434ecbc2 Merged [47033]: TableListField::performReadonlyTransformation now sets show permission.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60383 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:00:27 +00:00
Ingo Schommer
4735f91ab8 (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@60352 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:39:14 +00:00
Ingo Schommer
382f34c69b (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@60335 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:10:59 +00:00
Ingo Schommer
b6abd40783 (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@60330 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:03:52 +00:00
Ingo Schommer
2d8434a43f (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@60327 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 02:57:59 +00:00
Ingo Schommer
624540a2d0 (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@60314 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 02:25:44 +00:00
Hayden Smith
2d9c833de5 Merged [47028]: Encountered a problem with Form::formHtmlContent not always including javascript validation, so added a call to includeJavascriptValidation on the validator in Form::formHtmlContent. Also modified Validator to notify the form that the client-side validation JavaScript has already been included. This way it isn't included twice.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60311 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 01:50:24 +00:00
Ingo Schommer
b8adcd8aad (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@60289 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:21:44 +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
bf9f349210 (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@60276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:03:57 +00:00
Ingo Schommer
124a6e3934 (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@60268 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:53:56 +00:00
Ingo Schommer
935ee6d1bc (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@60266 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:35:11 +00:00
Ingo Schommer
8d0166e298 (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@60265 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:29:30 +00:00
Ingo Schommer
95d4634e2e (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@60264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:17:51 +00:00
Ingo Schommer
46bbde18e7 (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@60261 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:03:35 +00:00
Ingo Schommer
7b26120582 (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@60259 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 22:52:52 +00:00
Ingo Schommer
a1f37b93eb (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@60258 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 22:49:59 +00:00
Ingo Schommer
75f2cf2654 (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@60232 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:40:50 +00:00
Ingo Schommer
4ec93162a0 (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@60231 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:29:50 +00:00
Ingo Schommer
0a8f2a67f6 (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@60228 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:18:32 +00:00
Ingo Schommer
8fd1a33d84 (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@60227 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:57:44 +00:00
Ingo Schommer
d6967f10f1 MINOR syntax error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60217 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:08:13 +00:00
Ingo Schommer
016cff2093 (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@60209 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:38:44 +00:00
Ingo Schommer
b5776e0438 (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@60207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:54:55 +00:00
Ingo Schommer
6bd5da7e6e (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@60206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:29:30 +00:00
Ingo Schommer
03fcc80e19 (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@60205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:19:54 +00:00
Ingo Schommer
e25f44604f (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@60203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 02:00:40 +00:00
Ingo Schommer
4f5c4c79fc BUGFIX Using $extraClass in AutocompleteTextField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-07 22:26:49 +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
aeab0115a0 (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@59927 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:43:48 +00:00
Ingo Schommer
faeea52740 r52080, r52101, r52102 (merged from branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59897 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 02:43:46 +00:00
Ingo Schommer
8c05c9985a r52079 (merged from branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59890 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 02:16:16 +00:00
Ingo Schommer
3a817610bc MINOR Fixed crazy messed up indentation in TableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59518 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-30 06:40:17 +00:00
Ingo Schommer
92d91c0fd2 BUGFIX Fixed TableListField->setClick_PopupLoad() to parse ID-value out of new <td> identifiers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59340 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-29 02:23:54 +00:00
Ingo Schommer
2fa80823e0 BUGFIX Removed duplicate SecurityID fields on each row of a TableField (calls $myForm->Fields() which by default will include more than the actual form fields passed to the constructor)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-28 07:39:33 +00:00
Ingo Schommer
1a4212602f BUGFIX (by cinek) PHP validation field name for [Custom]RequiredField: Server side validation displays field name instead of field label in messages, e.g. "EditableEmailField?1 is required" instead of e.g. "E-mail address is required" for a field with label "Email address". (patch from #2560)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@58305 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-17 21:58:59 +00:00
Ingo Schommer
ed27d39e09 BUGFIX php notices
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@58135 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-16 04:54:49 +00:00
Sam Minnee
7a9dd25b9c BUGFIX: Fixed HTML toolbar separator image reference; updated it to use MCE_ROOT
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@57766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-10 23:29:20 +00:00
Sam Minnee
60a24885b8 BUGFIX: #2510 - Fix setting of default country on CountryDropdownField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@57764 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-10 23:18:38 +00:00
Sean Harvey
b81f0be92a BUGFIX Fixed saving a CheckboxSetField value into a field that is not a has_many or many_many relationship. It should be just a comma separated list in a standard text field.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@57092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-30 02:55:51 +00:00
Andrew O'Neil
87a43ce8c1 MINOR: #2470 Fix PHP notice (cmswarrior)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56949 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-25 06:04:14 +00:00
Andrew O'Neil
9faf153965 MINOR: #2322 - Editable Checkbox Groups in user defined forms should display the field's name, not
a pointless number (DanielVF)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56942 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-25 05:35:17 +00:00
Andrew O'Neil
b078262c1e Merged revisions 54402 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r54402 | sminnee | 2008-05-13 15:07:43 +1200 (Tue, 13 May 2008) | 1 line
  
  #2501 + #2500 - Fixed notice-level errors in editable forms
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56904 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-25 03:56:57 +00:00
Andrew O'Neil
b11956268e Merged revisions 54212 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r54212 | sminnee | 2008-05-09 11:12:34 +1200 (Fri, 09 May 2008) | 1 line
  
  #2447 - Bug in editing comment
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56902 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-25 03:48:00 +00:00
Sean Harvey
d0ad2f14ff BUGFIX CheckboxField->Field() was returning HTML code inside HTML code. This should only be assigning values in the $attributes array, and letting createTag() handle the generation of HTML
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56490 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-18 10:07:56 +00:00
Ingo Schommer
9437c5b228 MINOR Moved UserDefinedForm related files into sapphire/forms/editor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56213 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-15 13:45:10 +00:00