Commit Graph

58 Commits

Author SHA1 Message Date
Sam Minnee
5cb4090145 BUGFIX: r101093 broke casting of values from the failover object. Add lookup to the failover for casting info, and add test (from r103240)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112127 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:38:23 +00:00
Sam Minnee
4414b8a747 BUGFIX #5243 Undefined Convert functions in ViewableData replaced with working versions. Thanks benediktb!
MINOR Updated ViewableDataTest to verify ViewableData changes (from r101638)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112013 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:56:04 +00:00
Sam Minnee
135b65ee04 BUGFIX Fixed SiteTree->Content link shortcode parsing introduced in r101093 (#5227) (from r101302)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111992 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:42:17 +00:00
Sam Minnee
7d248e6835 BUGFIX #5214 ViewableData::obj() was creating a DBField without a fieldname argument and caused problems, one example is the version panel of the CMS (from r101154)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111962 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:47:48 +00:00
Sam Minnee
cc355a4f18 API CHANGE: Replaced eval based creation of extension and field objects with Object::create_from_string().
API CHANGE: Introduced new function Object::create_from_string() to instantiate an object from a string like 'Int(50)' (from r101093)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111585 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:46:41 +00:00
Sam Minnee
ee81852097 MINOR Fixed phpDoc argument in ViewableData::hasValue() (from r100922)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111542 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:21:32 +00:00
Ingo Schommer
72bb124951 MINOR: Edit-case checking of data in ViewableData::$failover for better error message. (from r95560) (from r98090)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:02:18 +00:00
Sean Harvey
6be405f189 API CHANGE Renamed ViewableData->SecurityID() to getSecurityID() in order to get its value loading through Form->loadDataFrom() (from r94178)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95591 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:37:21 +00:00
Sean Harvey
0cc0d3c767 BUGFIX Fixed inconsistent default to ViewableData::Modulus() - should be 0 as per ViewableData::MultipleOf() (from r94073)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95587 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:36:20 +00:00
Sean Harvey
ed630229ab BUGFIX Modulus and MultipleOf should start at index 0 to match the iterator position, by default (from r94071)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95586 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:36:04 +00:00
Sean Harvey
d6e9931eb4 FEATURE Added MultipleOf and Modulus methods to ViewableData - useful for templating work (from r94063)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95584 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:35:32 +00:00
Will Rossiter
61a30f9d3a API CHANGE: Removed val(). Use XML_val() instead.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93650 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 21:37:19 +00:00
Ingo Schommer
895644cf9f BUGFIX: Don't failover to standard value in ViewableData_Customised if the customised value is defined but isn't set. $obj->customise(array('Content'=>'')) should set Content to '' (from r91047)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92451 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 01:41:06 +00:00
Andrew Short
a8e96ef3f0 MINOR #3728: Updated ViewableData to cast to HTMLText rather than HTMLVarchar by default so more XML-centric methods are exposed.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90977 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-08 21:53:56 +00:00
Ingo Schommer
00eb220e91 BUGFIX Don't return empty value from ViewableData->XML_val() if the actual value is an uncasted 0 integeter (or anything else evaluating to untyped boolean false)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89161 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:48:24 +00:00
Sam Minnee
24435fbbf7 BUGFIX: Fixed bugs in ViewableData casting system.
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88664 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-12 06:58:40 +00:00
Sam Minnee
b868075ef3 ENHANCEMENT: Improved performance of ViewableData casting by removing an object::get_static call
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88570 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-12 00:40:15 +00:00
Andrew Short
365b4784a9 FEATURE: Refactored ViewableData. The main changes are:
* Values are not always casted before being rendered into a template.
	* Casting information can by dynamically provided by $casting_properties, rather than being hardcoded to $casting and $db.
	* Removed unneeded ViewableData_Iterator - ArrayIterator is instead used.
	* Removed ViewableData_ObjectCustomised - now just uses ViewableData_Customised.
ENHANCEMENT: Added template and value methods to database fields.
MINOR: Added ViewableDataTest and extended DataObjectTest.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88474 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:06:58 +00:00
Geoff Munn
7eb3cf66e8 API CHANGE: array brackets removed for generation of field types
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@87894 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-01 21:03:05 +00:00
Sam Minnee
21ca3123bc ENHANCEMENT: Improved performance of all ViewableData object instantiation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@83437 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-31 05:38:20 +00:00
Sam Minnee
ebbcf036ee BUGFIX: Treat _method() as a cacheable method but not __method()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78240 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-02 04:02:28 +00:00
Sean Harvey
76b5adc979 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75579 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-28 23:52:15 +00:00
Sam Minnee
b165bde578 BUGFIX #3919: Fix DataObject::dbObject() for decorated fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75150 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-27 00:44:10 +00:00
Ingo Schommer
b12a00c391 MINOR phpdoc documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73509 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-22 22:59:14 +00:00
Ingo Schommer
2a2e83f8e3 MINOR Documentaion
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73234 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-17 20:21:21 +00:00
Ingo Schommer
94c71b3447 MINOR Casting ViewableData->Even() and ViewableData->Odd() as boolean
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72359 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-02 20:25: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
Sam Minnee
3d9532db83 Merged branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66108 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-18 01:48:37 +00:00
Sam Minnee
f3419bf046 BUGFIX #2243: Fixed ViewableData::Odd
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65275 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 04:31:53 +00:00
Ingo Schommer
049ab468e3 MINOR Misc deprecation notes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64400 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 11:03:01 +00:00
Ingo Schommer
2d44f59816 API CHANGE Removed ViewableData->setVal(), use ViewableData->setValue()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64383 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 08:44:32 +00:00
Normann Lou
ec1724cc4d BUGFIX: avoid a CSSClass is added to a veiwable data twice.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64328 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 00:52:50 +00:00
Ingo Schommer
09e3d91956 ENHANCEMENT Added support for customize parameters to ViewableData->renderWith() to avoid unnecessary chaining ($this->customize($params)->renderWith($template))
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63648 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-05 19:19:07 +00:00
Ingo Schommer
ef7f988b3b ENHANCEMENT Added ViewableData->i18nLocale, used in LeftAndMain.ss to determine interface language through meta tags
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63564 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-03 00:43:59 +00:00
Sean Harvey
4e5162c90c MINOR: Fix phpdoc parsing error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63121 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-26 04:18:18 +00:00
Geoff Munn
635928afad Null values fixed for PHP 5.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62188 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-10 22:16:35 +00:00
Hayden Smith
3982ccda5c Merged [47061].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60487 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 04:54:59 +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
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
Sam Minnee
37d3aa1695 Improved behaviour of ViewableData_Iterator. It's not clear why, but this was causing a bug on our build slave. Maybe a PHP version difference?
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:58:31 +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
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
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
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
Ingo Schommer
20b0a8ef6e Merged revisions 49843 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r49843 | ischommer | 2008-02-20 12:03:49 +1300 (Wed, 20 Feb 2008) | 1 line
  
  added $casting for BaseHref()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49837 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 23:04:12 +00:00
Ingo Schommer
a1451739a4 Merged revisions 48168 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r48168 | ischommer | 2008-01-17 17:20:45 +1300 (Thu, 17 Jan 2008) | 1 line
  
  renamed escapeFlagForField() to escapeTypeForField(), updated documentation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48163 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 04:23:31 +00:00
Ingo Schommer
0b5ab1fc7b Merged revisions 48164 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r48164 | ischommer | 2008-01-17 17:05:49 +1300 (Thu, 17 Jan 2008) | 2 lines
  
  Deprecated use of DBField 'Text' for saving HTML-Content (added check in HTMLEditorField->saveInto())
  Added ViewableData->escapeFlagForField() to determine if the record-field needs escaping (currently only 'xml' supported)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48162 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 04:22:13 +00:00
Andrew O'Neil
a597942984 Added $SecurityID for templates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47839 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 20:47:50 +00:00