Commit Graph

233 Commits

Author SHA1 Message Date
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
Sam Minnee
b8262b6d48 Merged revisions 50783 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50783 | sminnee | 2008-03-10 16:02:12 +1300 (Mon, 10 Mar 2008) | 1 line
  
  Added 'anchor' option to link inserter
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 03:29:30 +00:00
Sam Minnee
05dc1eee2c Merged revisions 50683 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50683 | aoneil | 2008-03-07 11:05:27 +1300 (Fri, 07 Mar 2008) | 2 lines
  
  #2295 - DataObjectSets cannot be iterated over multiple times concurrently
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50871 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:31:43 +00:00
Sam Minnee
a0be727cc3 Merged revisions 50488 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50488 | sminnee | 2008-03-03 21:59:09 +1300 (Mon, 03 Mar 2008) | 1 line
  
  #2280 - Fixed XML parsing errors in CTF
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50870 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:31:38 +00:00
Sam Minnee
6c5ee3ceb9 Merged revisions 50214 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50214 | sminnee | 2008-02-26 16:12:22 +1300 (Tue, 26 Feb 2008) | 2 lines
  
  A bit of a hack to fix double-escaped URLs in the CMS.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50865 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:30:36 +00:00
Ingo Schommer
5c76b90fb7 fixed PHP notices
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 00:40:25 +00:00
Mark Rickerby
0a543a9ae1 made $messageType parameter of Validator::validationError optional, and added API docs to explain what (apparently) is going on
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50638 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-06 02:06:47 +00:00
Mark Rickerby
79835098b0 fixing typo in parameter name $validate --> $validator
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50634 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-06 01:21:47 +00:00
Matt Peel
7d13ba7fb8 Reverted geoffm's accidental commit to /open
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 02:10:37 +00:00
Geoff Munn
bf3c09bec6 First post
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 01:06:39 +00:00
Sam Minnee
53ef54c4b1 Removed use of deprecated setExtraClass
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49885 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:39:17 +00:00
Ingo Schommer
3f6afa2904 Merged revisions 49834 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r49834 | ischommer | 2008-02-20 11:45:56 +1300 (Wed, 20 Feb 2008) | 1 line
  
  fixed sql-injection
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 22:46:30 +00:00
Andrew O'Neil
89f2c50e51 fix caching in complex table field
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49440 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-12 20:51:59 +00:00
Ingo Schommer
0121fb8fe2 Merged revisions 49386 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r49386 | ischommer | 2008-02-12 09:24:29 +1300 (Tue, 12 Feb 2008) | 2 lines
  
  added setFields()/setActions()
  formatting
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49380 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-11 20:25:22 +00:00
Sam Minnee
8f4ed9d16b Removed clone behaviour from Form::Fields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49173 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-07 02:58:23 +00:00
Ingo Schommer
1bf544c264 documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49026 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-04 01:31:55 +00:00
Ingo Schommer
fc3a2cc298 documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49025 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-04 01:31:37 +00:00
Andrew O'Neil
664e6899f8 fix sql error on comments section
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-01 02:33:42 +00:00
Ingo Schommer
d28faae514 updating form in ctf-popup after saving (including validation-errors and fields that have may changed on the serverside, e.g. ImageField)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48867 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-30 22:57:23 +00:00
Ingo Schommer
21180f52bd compressed ImageField layout to fit in CTF-popup (removed "click here to remove" label)
removed iframe-borders for IE

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48848 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-30 20:12:19 +00:00
Andrew O'Neil
97f3d722b4 Add ability to choose which file to upload to in a FileField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48778 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-29 20:18:06 +00:00
Sam Minnee
e0614530c6 Merged revisions 48451 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r48451 | jshipman | 2008-01-23 14:42:20 +1300 (Wed, 23 Jan 2008) | 1 line
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48541 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:13:24 +00:00
Sam Minnee
68f7be24ed Merged revisions 48178 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r48178 | aoneil | 2008-01-18 09:04:53 +1300 (Fri, 18 Jan 2008) | 2 lines
  
  Fix incorrect text boxes being set on an ajax request
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48540 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:13:05 +00:00
Sam Minnee
d34672a260 Merged revisions 48082 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r48082 | aoneil | 2008-01-16 16:44:45 +1300 (Wed, 16 Jan 2008) | 2 lines
  
  Allow many-many complex table fields to be used on the reverse side of the join (belongs many many)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48539 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:12:42 +00:00