Commit Graph

356 Commits

Author SHA1 Message Date
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
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
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
Sean Harvey
ef1033111a BUGFIX Tab->fieldByName() was checking the property "Name" on the child elements, when it's actually a method call instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56179 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-13 01:56:29 +00:00
Sean Harvey
7ec8c205f1 ENHANCEMENT Form->formTemplate() - allow rendering with Form subclass template
MINOR code convention formatting

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56142 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-12 09:04:07 +00:00
Sean Harvey
f2bfbc652e MINOR function php doc comments, and code formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56141 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-12 08:54:03 +00:00
Sean Harvey
3f8591a807 BUGFIX call to $field->Name should be $field->Name() - see Form->Fields() for the correct way
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@55161 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-26 23:53:24 +00:00
Ingo Schommer
d18509a3f5 Merged revisions 54455 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r54455 | gmunn | 2008-05-13 16:55:27 +1200 (Tue, 13 May 2008) | 1 line
  
  Password change fix, plus layout issues
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@55072 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-24 01:22:27 +00:00
Romain Louis
52e1c2cd66 XML parse error fixing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@54242 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-09 02:38:09 +00:00
Sam Minnee
14da70e64e Merged revisions 53204 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r53204 | sharvey | 2008-04-22 15:55:34 +1200 (Tue, 22 Apr 2008) | 1 line
  
  MINOR: PHP notice fix - undefined variable
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53529 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:54:47 +00:00
Sam Minnee
d8b65304d4 Merged revisions 53188 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r53188 | aoneil | 2008-04-22 14:17:32 +1200 (Tue, 22 Apr 2008) | 2 lines
  
  MINOR: Fixed some php notices
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:54:38 +00:00
Sam Minnee
76e6ea3dc9 Merged revisions 53106 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r53106 | rlouis | 2008-04-21 15:47:15 +1200 (Mon, 21 Apr 2008) | 1 line
  
  _t call for EXPORTCSV problem fixed
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53525 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:54:00 +00:00
Sam Minnee
5c5c93c412 Merged revisions 52878 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52878 | sminnee | 2008-04-16 20:13:41 +1200 (Wed, 16 Apr 2008) | 1 line
  
  Show bad error messages in a red style
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53492 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:36:12 +00:00
Sam Minnee
7590ae194b Merged revisions 52876 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52876 | sminnee | 2008-04-16 20:13:04 +1200 (Wed, 16 Apr 2008) | 1 line
  
  Removed validation from ConfirmedPasswordField - use Member validation instead
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53490 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:35:50 +00:00
Romain Louis
0a124ec302 isset check replaced by non empty
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53146 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-21 23:21:48 +00:00
Romain Louis
eb018ad36a getParentIdNameRelation bug fixing and cleaning : This function is usefull only for the has_one and has_many relation but useless for many_many
Morerover, it manages well now the child heritage and parent heritage

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-21 05:29:59 +00:00
Romain Louis
c5c3cf19b6 Save method bugs fixing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53113 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-21 05:19:55 +00:00
Mark Rickerby
ef75418f7b BUGFIX: fixed typo in variable name that was causing payment form validation to break
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52991 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-18 04:28:37 +00:00
Romain Louis
0d29142f89 Bug fixing on the parse function
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52990 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-18 03:50:29 +00:00
Romain Louis
9e0e9d3238 Join source bug fixing when there is no that table with the exact sourceName
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52983 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-18 03:00:39 +00:00
Ingo Schommer
1e93305699 BUGFIX php notice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52930 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-17 10:11:40 +00:00
Ingo Schommer
12c3ab559f Merged revisions 32182 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct

........
  r32182 | ischommer | 2007-03-14 23:34:50 +1300 (Wed, 14 Mar 2007) | 1 line
  
  More versatile character-replacing for css-classes
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52775 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:21:45 +00:00
Ingo Schommer
ce8bf58b0d Merged revisions 32179 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct

........
  r32179 | ischommer | 2007-03-14 23:34:06 +1300 (Wed, 14 Mar 2007) | 1 line
  
  Return title when calling Name(), so we can do removeByName() on "anonymous" fields
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52774 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:21:25 +00:00
Ingo Schommer
f7aa3ac61a Merged revisions 51249 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r51249 | ischommer | 2008-03-18 11:58:39 +1300 (Tue, 18 Mar 2008) | 1 line
  
  added $titleConfirmField as fallback to localized default
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52413 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:29:29 +00:00
Ingo Schommer
4f46aff087 Merged revisions 49161 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r49161 | ischommer | 2008-02-07 14:25:07 +1300 (Thu, 07 Feb 2008) | 1 line
  
  avoid double escaping through attr*() and raw2att in createTag()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52407 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:21:22 +00:00
Ingo Schommer
e27513f11e Merged revisions 47721 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47721 | ischommer | 2008-01-08 15:58:39 +1300 (Tue, 08 Jan 2008) | 1 line
  
  formatting, syncing logic with FileField
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52402 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:15:02 +00:00
Ingo Schommer
ee179fe668 Merged revisions 47622 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47622 | ischommer | 2008-01-04 21:44:39 +1300 (Fri, 04 Jan 2008) | 1 line
  
  fixed relation-setting to respect subclasses of File in has_one
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52399 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:11:03 +00:00
Ingo Schommer
b465a46bcc API CHANGErefactored upload functionality from File into newly created Upload class
API CHANGE deprecated some File functions and attributes
API CHANGE moved management function from File to Filesystem and added permission checks: sync(), loadContent(), fixfiles(), moverootfilesto()
API CHANGE deprecated use of File->loadUploaded()
ENHANCEMENT added filesize and extension validation to AssetAdmin and FileField
FEATURE added tests for Upload class

Merged revisions 47617 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-mesq

........
  r47617 | ischommer | 2008-01-04 19:20:29 +1300 (Fri, 04 Jan 2008) | 5 lines

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 08:20:13 +00:00
Ingo Schommer
9e98f127f2 Merged revisions 47613 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47613 | ischommer | 2008-01-04 19:14:58 +1300 (Fri, 04 Jan 2008) | 1 line
  
  adding tabIndex capabilities, switching HTML-rendering to createTag()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52199 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:08:45 +00:00
Ingo Schommer
cb860c2f75 Merged revisions 47612 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47612 | ischommer | 2008-01-04 19:11:57 +1300 (Fri, 04 Jan 2008) | 1 line
  
  formatting, removed saveInto() (same functionality as parent-class)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52198 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:08:03 +00:00
Ingo Schommer
f4998d0b8d BUGFIX improved error checking in saveInto()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52197 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:07:05 +00:00
Ingo Schommer
1b1af23c66 formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52196 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:05:41 +00:00
Ingo Schommer
48193739d3 Merged revisions 47611 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47611 | ischommer | 2008-01-04 19:11:42 +1300 (Fri, 04 Jan 2008) | 1 line
  
  formatting, removed saveInto() (same functionality as parent-class)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52195 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:05:23 +00:00
Ingo Schommer
caa59b2fce Merged revisions 47609 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47609 | ischommer | 2008-01-04 19:10:25 +1300 (Fri, 04 Jan 2008) | 1 line
  
  fixed validate() (wrong parameters)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52193 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:03:33 +00:00
Ingo Schommer
275e08bee1 Merged revisions 47608 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47608 | ischommer | 2008-01-04 19:09:50 +1300 (Fri, 04 Jan 2008) | 1 line
  
  additional value-checking in createTag()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52192 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:03:15 +00:00
Ingo Schommer
b08dba9173 Merged revisions 47505 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47505 | ischommer | 2007-12-22 17:31:58 +1300 (Sat, 22 Dec 2007) | 1 line
  
  fixed maxlength mixups
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52190 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:02:39 +00:00
Ingo Schommer
230e77e712 Merged revisions 47501 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47501 | ischommer | 2007-12-22 17:26:09 +1300 (Sat, 22 Dec 2007) | 1 line
  
  fixed getTabIndex() typo
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:02:21 +00:00
Ingo Schommer
f737d52138 Merged revisions 47500 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47500 | ischommer | 2007-12-22 17:25:34 +1300 (Sat, 22 Dec 2007) | 1 line
  
  changed field-rendering to use createTag()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52188 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:02:05 +00:00
Ingo Schommer
aa13b78838 Merged revisions 47499 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47499 | ischommer | 2007-12-22 17:23:26 +1300 (Sat, 22 Dec 2007) | 1 line
  
  added tabIndex
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52187 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:01:28 +00:00
Ingo Schommer
e0f6e50c82 Merged revisions 47414 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47414 | ischommer | 2007-12-20 18:17:40 +1300 (Thu, 20 Dec 2007) | 1 line
  
  added option to loadDataFrom() for loading values from nested arrays that PHP generated from URL-strings
........

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52184 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 03:52:14 +00:00
Ingo Schommer
b3f8bdc8ef Merged revisions 47413 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47413 | ischommer | 2007-12-20 18:16:26 +1300 (Thu, 20 Dec 2007) | 1 line
  
  syntax
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 03:36:07 +00:00
Ingo Schommer
220b78454c API CHANGE added Form->getForm()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52181 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 03:33:55 +00:00
Ingo Schommer
770f55e9a5 Merged revisions 47401 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47401 | ischommer | 2007-12-20 16:21:21 +1300 (Thu, 20 Dec 2007) | 1 line
  
  using formfield title (instead of id) for required validation message (on serverside)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52180 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 03:33:15 +00:00
Ingo Schommer
c9aceb01e1 Merged revisions 47264 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47264 | ischommer | 2007-12-18 16:57:08 +1300 (Tue, 18 Dec 2007) | 1 line
  
  setting $title for first sub-field instead of dismissing it
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52157 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-04 23:15:42 +00:00
Andrew O'Neil
7fa0a96c71 Merged revisions 51938 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r51938 | aoneil | 2008-04-01 14:34:26 +1300 (Tue, 01 Apr 2008) | 2 lines
  
  fix php notice
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51932 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-01 01:50:34 +00:00
Ingo Schommer
0d49845a73 ENHANCEMENT HiddenFields() now returns FieldSet rather than concatenated HTML string
BUGFIX renamed genExtraFields() to getExtraFields(), now returns a FieldSet rather than adding to $this->fields automatically (allows for external control and inspection)
BUGFIX adding fields from getExtraFields() in Fields()
ENHANCEMENT changed visibility of getExtraFields to public
BUGFIX removed $action->unsetthis() in unsetActionByName
ENHANCEMENT remove $securityTokenAdded flag (unnecessary state, can be determined by inspecting fieldset)
ENHANCEMENT documentation, coding conventions, removed debug code

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51131 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-16 22:15:04 +00:00
Mark Rickerby
b6dbeec30d initial tweaks to Form to better support use in template control blocks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50988 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-13 01:39:57 +00:00
Ingo Schommer
c35ae17168 #2310 MemberTableField Popup breaks after saving
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50947 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-12 09:24:59 +00:00
Ingo Schommer
02064ce611 BUGFIX fixed csv export in MemberTableField by checking for valid database columns when building SELECT statement
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50945 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-12 09:23:53 +00:00
Ingo Schommer
c5d538c366 Merged revisions 50947 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r50947 | ischommer | 2008-03-12 21:53:28 +1300 (Wed, 12 Mar 2008) | 1 line
  
  BUGFIX properly setting $childID in form for newly created items to avoid duplicates after subsequent saving (the form reloaded without the ID connection)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50941 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-12 08:54:24 +00:00
Sam Minnee
9c1c5f5c2f Merged revisions 50903 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50903 | sminnee | 2008-03-11 17:29:06 +1300 (Tue, 11 Mar 2008) | 1 line
  
  #2302 - Fixed double-escaping of CTF popup page-navigation links
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50898 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 04:30:14 +00:00