mark_story
df5d9ac3d1
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
wnasich
c95ab282dc
Test case and Fix for: Number::currency() issue
...
Fixes currency() for custom formats and numbers between -1 and 1.
Fixes #2489
Conflicts:
lib/Cake/Test/Case/View/Helper/NumberHelperTest.php
lib/Cake/View/Helper/NumberHelper.php
2012-01-19 21:07:27 -05:00
Renan Gonçalves
3a3d89d6d1
Updating test to reflect last changes made by pull #413 .
2012-01-16 16:51:49 +01:00
mark_story
c89c49c310
Enhance HtmlHelper::getCrumbs() $startText param
...
It now accepts an array which gives more control and flexibilibity
over the first breadcrumb link.
Fixes #2475
2012-01-14 13:14:26 -05:00
Ceeram
7badb1d252
fix magic __isset()
2012-01-14 12:42:10 -05:00
mark_story
d238d8c0bb
Fix incorrect __isset()
.
...
There was a missing $ before name. Fixes issues
with dynamic properties not being handled correctly.
Fixes #2450
2012-01-09 21:47:57 -05:00
Jose Lorenzo Rodriguez
7c0297a92c
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-05 19:58:15 -04:30
Jose Lorenzo Rodriguez
00a0c60733
Removing 1.3 Backwards compatible code to load underscored files. Now you can App::build('Locale') instead of 'locales'
2012-01-05 19:56:01 -04:30
mark_story
9562638610
Merge branch '2.0' into 2.1
2012-01-04 07:39:35 -05:00
mark_story
3e1c567f08
Remove duplicate methods.
...
Fix regression where #1345 was re-introduced.
Fixes #2434
2012-01-03 21:11:45 -05:00
mark_story
3478f8a627
Merge branch '2.0' into 2.1
2011-12-30 10:19:51 -05:00
Jose Lorenzo Rodriguez
a47c8160dd
Merge remote-tracking branch 'origin/2.1' into 2.1
2011-12-28 19:29:48 -04:30
mark_story
69b1c33f1f
Fix extending in loops.
2011-12-27 19:24:16 -05:00
mark_story
70981d05ca
Throw an exception when a view extends itself.
2011-12-27 19:24:15 -05:00
Ceeram
d8cbe8a1f7
Cleaning up
...
- Adding docblock
- Adding visibility keyword
- Update assertion methods.
- Split up tests into smaller methods.
2011-12-27 19:23:52 -05:00
Ceeram
210f8c9e2c
adding tests for plugindot syntax in view filenames
2011-12-27 19:22:21 -05:00
Jose Lorenzo Rodriguez
078a2dfd72
Migrating View and Helpers events to use the CakeEvenManager
2011-12-25 19:00:19 -04:30
Kyle Robinson Young
acca796d10
Fix tag order when closing open tags with TextHelper::truncate()
2011-12-25 09:10:50 -08:00
Kyle Robinson Young
4e7e06fa9f
Prevent TextHelper::truncate() from breaking HTML
...
Fixes #2397
2011-12-24 21:25:07 -08:00
ADmad
389072708a
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
euromark
a41539dfa4
Indentation fix (tab instead of spaces)
...
Fixes #2398
Conflicts:
lib/Cake/Test/Case/Console/Command/ShellTest.php
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-20 22:26:43 -05:00
mark_story
c13e6588f5
Datetime labels should point at the first input.
...
Label elements generated for datetime/date/time inputs should point
at the first generated input. Apply + update patch from MrRio.
Fixes #427
2011-12-19 22:09:46 -05:00
mark_story
866177f37d
Fix issue with link generation and no title.
...
Fix urlencoded text from being displayed in text of links.
Fixes #2387
2011-12-19 20:49:01 -05:00
Kyle Robinson Young
5225fe2b5c
Ability to set hiddenField value with FormHelper::checkbox
...
Fixes #1811
2011-12-18 23:34:19 -08:00
Kyle Robinson Young
c93dab69a3
Correct placement of between on FormHelper radio and input
...
Fixes #1992
2011-12-18 08:25:42 -08:00
mark_story
0607437abd
Fix various failing tests.
2011-12-17 23:50:41 -05:00
mark_story
46bb6c8ad6
Adding tests and functionality for nested blocks.
2011-12-17 22:23:37 -05:00
mark_story
f0f3eb9ba9
Fix a few outstanding issues with blocks.
...
- Blocks left open after rendering files should trigger
an exception.
- Fix strict errors.
- Correct doc blocks.
2011-12-17 22:23:37 -05:00
mark_story
bcb8444ab1
Make CacheHelper able to handle nocache tags in elements.
...
Using afterRenderFile() instead of afterRender() allows
CacheHelper to parse content in elements and extended views.
2011-12-17 22:23:37 -05:00
mark_story
fb20841d25
Doing some internal re-factoring in CacheHelper.
...
cache() should only do one thing.
It shouldn't do more work than is necessary each time its called.
Flatten some of the conditions by extracting methods.
2011-12-17 22:23:37 -05:00
mark_story
c5c2859800
Fixing failing tests.
2011-12-17 22:23:36 -05:00
mark_story
c49e261eba
Adding new callbacks into View.
2011-12-17 22:23:36 -05:00
mark_story
e06895ef91
Adding view files for tests.
...
Adding test case for elements + extending
Making elements extend each other.
2011-12-17 22:23:35 -05:00
mark_story
b6919a0268
Starting the extend() feature.
...
Adding a simple test case.
Still need to add callbacks around every view fragment rendered.
Without that CacheHelper will not be able to cache extended views
correctly.
2011-12-17 22:23:35 -05:00
mark_story
b866c00318
Renaming methods so they are shorter and still make sense.
2011-12-17 22:23:35 -05:00
mark_story
82139fe8f6
Updating HtmlHelper to allow custom blocks.
...
Adding tests for blocks.
Adding missing tests.
2011-12-17 22:23:34 -05:00
mark_story
7854f9dd52
Add View::getBlock()
...
View::get() had two jobs. That's almost always a bad thing.
Add a new method instead.
2011-12-17 22:23:34 -05:00
Mark Story
4606ea39a9
Updating HtmlHelper and its tests to use View::append().
2011-12-17 22:23:34 -05:00
Mark Story
bd4ee41e24
Deprecating addScript() its replaced by blocks feature.
...
Adding View::blocks() for getting the list of blocks.
2011-12-17 22:23:33 -05:00
Mark Story
9107913c07
Implementing basic features of view 'blocks'
2011-12-17 22:23:33 -05:00
Mark Story
3e2bde523b
Adding tests for Blocks in View.
...
Blocks should replace scripts_for_layout and content_for_layout
in a future version of CakePHP.
2011-12-17 22:23:33 -05:00
mark_story
a71b0f9867
Adding test for CacheHelper.
...
Refs #2381
2011-12-17 12:09:50 -05:00
Kyle Robinson Young
51f9837db4
Code standards formatting
2011-12-15 22:52:07 -08:00
Rachman Chavik
a88ca54a8d
updating usage of assertEqual -> assertEquals
2011-12-13 21:03:40 +07:00
mark_story
2e8498e166
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
mark_story
8bb6f8803c
Fix infinite loop when minYear/maxYear are not int.
...
Refs #2361
2011-12-11 22:11:14 -05:00
mark_story
bbd6e22e26
Add test for FormHelper::select() + 0
...
Closes #2352
2011-12-08 20:15:54 -05:00
ADmad
df097796c4
Fixing incorrect setting of default value for 'onDomReady' option in JsHelper::writeBuffer()
2011-12-08 14:03:39 +05:30
mark_story
64eb38a953
Fix disabled + SecurityComponent
...
Disabled inputs should be omitted from the secured fields.
This will enable forms to submit successfully as long as those
inputs stay excluded from the form submission.
Fixes #2333
2011-12-07 22:30:40 -05:00
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -08:00