Commit Graph

28 Commits

Author SHA1 Message Date
Loz Calver
c58f4c469d Replace core uses of DataObject::has_one/has_many/many_many 2015-03-13 16:16:12 +00:00
Damian Mooyman
eb069e605d Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Ju
e49d247fba fixed wrong ID output for many_many and has_many relations 2013-10-06 17:36:31 +02:00
Ingo Schommer
3b02d22989 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	dev/CsvBulkLoader.php
2013-05-09 10:34:20 +02:00
Ingo Schommer
b211f22bf9 FIX JSONDataFormatter wrong relation identifiers (fixes #1795) 2013-04-26 11:40:24 +02:00
Ingo Schommer
3334eafcb1 API Marked statics private, use Config API instead (#8317)
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
2013-03-24 17:20:53 +01:00
Sean Harvey
aff28eb896 BUG JSONDataFormatter should respect canView() permissions 2012-11-05 14:03:39 +13:00
Sam Minnee
1f7fc1f76a FIX Remove instances of lines longer than 120c
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit.  This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
2012-09-30 17:18:13 +13:00
Elliot Sawyer
71758c782f ISSUE 7833: Invoke ShortcodeParser on RestfulServer output 2012-09-17 17:53:51 +12:00
Simon Welsh
f07258f3cf MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
Fred Condo
d370423825 Clean up trailing ?> per coding standard
All sapphire but the lang directory
2012-02-12 12:40:16 -08:00
Stig Lindqvist
e38dd08ea5 MINOR: Fix docblocks to reference SS_List instead of (now deprecated) DataObjectSet where appropriate 2011-10-28 15:58:55 +13:00
ajshort
04e5dae22e MINOR: Updated places that expect a DataObjectSet to accept an SS_List instance. 2011-05-02 17:14:05 +10:00
Julian Seidenberg
a204c136fe API CHANGE: JSONDataFormatter builds JSON itself, changing it to use Convert::array2json() instead (fixes #5162, thanks sharvey) 2011-03-30 18:16:12 +13:00
Sam Minnee
3ddd5647a1 BUGFIX #5862 JSON output of JSONDataFormatter now uses quotes for keys to be safer (from r108409)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112729 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-18 22:55:06 +00:00
Sam Minnee
7d765fc5c6 MINOR Fixed JSONDataFormatter excaping (fixes #5309, thanks briley) (from r101811)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112040 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:10:53 +00:00
Ingo Schommer
0b1fc5b91b BUGFIX Quoting keys in JSONDataFormatter to ensure valid JSON (#5119)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99853 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-25 00:00:24 +00:00
Ingo Schommer
e121c2f8fd BUGFIX Prevent relations without $api_access to be shown through RestfulServer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78123 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-29 01:04:40 +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
06d78ee993 ENHANCEMENT Don't like relations without $api_access in RestfulServer, added RestfulServer->getAllowedRelations()
ENHANCEMENT Added DataFormatter->setCustomRelations()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64003 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-09 14:47:25 +00:00
Sam Minnee
4495f9c939 FEATURE: Allow Use of ?fields=ID,Name,OtherField,RelName get variable on RESTful server queries, to restrict the fields and relations returned int the data set
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62458 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-16 12:10:58 +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
b89328e6cc (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@60235 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 07:03:24 +00:00
Ingo Schommer
c1440e0b02 (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@60234 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:53:26 +00:00
Ingo Schommer
7d2415c656 (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@60233 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:46:48 +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
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
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