Commit graph

33 commits

Author SHA1 Message Date
antograssiot
c2f298a8b7 Replace our custom code fence with markdown standard fence 2015-01-09 13:47:25 +01:00
ADmad
16df061d66 Fix api docblocks for View layer classes. 2014-05-30 01:23:12 +05:30
Bryan Crowe
24a522f972 Updated doc block for JsonView's subDir property 2013-09-17 20:25:32 -04:00
Bryan Crowe
878e599976 Corrected some grammar in the JsonView class doc blocks 2013-09-17 20:15:18 -04:00
Ber Clausen
c3ee9a2058 JsonView should return null if no data is set, regardless of the type of '_serialize'.
It should also honor true/false/0/'' values.
2013-09-07 02:38:52 -03:00
mark_story
c03edd9d1a Don't load Helpers in dataviews when _serialize is set.
Loading helpers when they aren't going to be used is wasteful.
2013-08-28 15:47:44 -04:00
Andy Dawson
f34388c53a Merge pull request #1471 from cakephp/feature/2.4-pretty-print
pretty print json and xml responses in debug mode
2013-08-03 01:35:56 -07:00
AD7six
1643e10c74 pretty print json and xml responses in debug mode 2013-08-02 15:17:24 +00:00
Christian Winther
cbb4f7db90 allow serialize in json and xml alias 2013-07-06 16:57:46 +00:00
ADmad
3303a2cda1 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
	lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
	lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
	lib/Cake/Console/Templates/skel/Config/acl.ini.php
	lib/Cake/Console/Templates/skel/Config/acl.php
	lib/Cake/Console/Templates/skel/Config/bootstrap.php
	lib/Cake/Console/Templates/skel/Config/core.php
	lib/Cake/Console/Templates/skel/Config/database.php.default
	lib/Cake/Console/Templates/skel/Config/email.php.default
	lib/Cake/Console/Templates/skel/Config/routes.php
	lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
	lib/Cake/Console/Templates/skel/Console/cake.bat
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Console/Templates/skel/Controller/AppController.php
	lib/Cake/Console/Templates/skel/Controller/PagesController.php
	lib/Cake/Console/Templates/skel/Model/AppModel.php
	lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
	lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
	lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
	lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
	lib/Cake/Console/Templates/skel/View/Pages/home.ctp
	lib/Cake/Console/Templates/skel/index.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
Marc Würth
4c9f0414cb Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
ADmad
13029cc2bc Merge branch 'master' into 2.4 2013-02-09 02:20:16 +05:30
Graham Weldon
66d856d883 Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4 This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
ADmad
afb62959ef Added JSONP support for JsonView 2013-02-04 23:20:49 +05:30
Ceeram
3f4d24bfc0 remove unused local variables and a few improvements 2012-12-23 13:53:13 +01:00
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
Ceeram
e7dc23b920 Ensure callbacks are triggered when using Xml/Json view with view templates.
PaginatorHelper for instance needs this to correctly set options
2012-08-22 13:13:49 +02:00
Ceeram
e2e42ee185 move serialization to separate method, for easier overriding in subclasses 2012-08-10 09:54:05 +02:00
euromark
3945c0e6a8 rtim files 2012-07-18 03:55:29 +02:00
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
euromark
22452f61f8 type hinting controllers and views 2012-02-25 19:46:06 -05:00
mark_story
0f8e1500de Ensure helpers are loaded in data views.
Both XmlView and JsonView should load helpers when
they use view files.

Fixes #2465
2012-01-11 20:21:56 -05:00
mark_story
0607437abd Fix various failing tests. 2011-12-17 23:50:41 -05:00
mark_story
168c6f14c2 Checking types before calling methods. 2011-11-28 21:36:13 -05:00
mark_story
cff980b45d Call parent::__construct so helpers are available. 2011-11-27 23:51:50 -05:00
mark_story
6e1b1df2b2 Change serialize to _serialize
Its possible that a developer would use 'serialize' as a legitimate
view variable.  Prefix with an _ to minimize that.
2011-11-27 23:51:49 -05:00
mark_story
50ec08f9bd Adding support for array serialize values.
Using an array for 'serialize' gives a set of view vars
to convert into the view output.
2011-11-27 23:51:49 -05:00
mark_story
5e9b1583e5 Making JsonView work more like the XmlView. 2011-11-27 23:51:48 -05:00
mark_story
011fd51539 starting to refactor views.
Adding comments.
Incomplete.
2011-11-27 23:51:48 -05:00
Juan Basso
e737845e95 Removing unnecessary code. 2011-11-27 23:51:47 -05:00
Juan Basso
873489053c Not loading helpers and others stuffs not necessary to Json view. Tests added. 2011-11-27 23:51:47 -05:00
mark_story
cfbc43671e Starting content type specific error pages.
- Adding RequestHandler to the error controller.  This allows reuse
  of all of Cake's internals.
- Adding a simple JsonView class to do serialized JSON views.
- Adding serialize hooks, and wiring things together.
2011-11-27 23:51:47 -05:00