mark_story
e3e4efba0a
Add test for issue #3936
...
radio() method should accept an array for the label element.
Refs #3936
2013-09-05 11:04:47 -04:00
mark_story
229c824da6
Remove a default helper from View.
...
This goes back to the days of yore and combined with
b8320fdbb7
it causes issues. The specific
issue at hand was testing a helper that uses other aliased helpers
(HtmlHelper specifically). The core helper would always be loaded
instead of the aliased one.
2013-09-01 21:39:59 -04:00
Phally
28dbc5b89b
PHPCS fixes.
2013-08-31 13:30:05 +02:00
ADmad
75e8facd2f
Remove JS constant use from tests.
2013-08-31 11:45:59 +05:30
mark_story
7bd2174c5b
Refactor tests to use a data provider.
2013-08-30 15:36:18 -04:00
mark_story
94b602b684
Merge pull request #1456 'fix-for-3515' into 2.4
...
Conflicts:
lib/Cake/Test/Case/View/ViewTest.php
Fixes #3515
2013-08-30 15:27:49 -04: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
mark_story
b8320fdbb7
Load helpers at View construction.
...
Loading helpers earlier in View's lifecycle allows for the removal of
many duplicated code segments and a now useless property. It slightly
modifies how View behaves in a test case, but that issue is easily
remedied by calling loadHelpers() a second time.
This primarily fixes issues where helpers may not be loaded in View
subclasses if they override any of View's methods. This is particularly
problematic when aliased helpers are involved.
Refs #4030
2013-08-28 12:27:07 -04:00
mark_story
42feb8dff6
Fix failing test.
...
Quote encoding in confirm handlers has changed in 2.4. Update the
relevant test.
2013-08-24 21:51:42 -04:00
mark_story
53d265cfba
Merge branch 'master' into 2.4
2013-08-23 12:56:43 -04:00
mark_story
24123e2374
Add test for postLink with escape false + confirm option.
...
Closes #4008
2013-08-21 13:09:47 -04:00
euromark
036954b52d
remove duplicate newlines according to CS
2013-08-20 20:27:06 +02:00
Alexander Hofbauer
80e589f19d
Correctly encode confirm handlers
...
With encode set to false the onclick handler will be sent through
h() regardless, making links and postLinks work again.
2013-08-13 10:11:22 +02:00
Jose Lorenzo Rodriguez
9d07fc4330
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/ShellDispatcher.php
lib/Cake/Utility/CakeNumber.php
lib/Cake/View/Elements/sql_dump.ctp
2013-08-11 23:31:10 +02:00
José Lorenzo Rodríguez
890d4a9e2c
Merge pull request #1478 from aleho/2.4
...
Use a protected method to generate confirm() links
2013-08-11 13:51:29 -07:00
Marc Würth
2a540ff8a8
Fix for #3515 , functional extension & tests
...
https://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/3515
I used (string) because it is faster than strval() and there are no real benefits in this case.
Also enabled assign(), append() and prepend() to take any values convertible to string.
Removed try/catch as discussed with ADmad.
Changed the three exception expecting tests to check for PHPUnit_Framework_Error now.
2013-08-09 01:34:08 +02:00
euromark
fc2d28974b
remove undocumented code and uncessary in_array() checks + cleanup
2013-08-08 03:56:58 +02:00
euromark
1339a9dfe1
coding standards according to new sniffer rules
2013-08-08 01:03:21 +02:00
ADmad
faa4262969
Merge pull request #1305 from jrbasso/2.4-fix-asset-full-url
...
Fixed full urls on asset methods
2013-08-07 10:29:11 -07:00
Mark
6c30851783
Merge pull request #1424 from dereuromark/2.4-form-helper-datetime-rounding
...
provide ability for rounding - closes #1986
2013-08-07 10:15:35 -07:00
Alexander Hofbauer
8601e0078a
Implement a Helper method to generate confirm() links
...
This allows for overriding the default behavior of showing
confirm()-dialogs in Html and Form helpers.
2013-08-06 10:04:44 +02:00
ADmad
38b050a711
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
Juan Basso
cda1a1e6c9
Added test for relative path using app asset configuration
2013-08-03 11:04:52 -04:00
Juan Basso
db6d0a748b
Fix for relative protocol on assets
2013-08-03 10:36:19 -04:00
Juan Basso
316c6582ea
Fixed pathPrefix for css and script methods
2013-08-03 10:36:19 -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
ADmad
61bf8df454
Renaming base url config keys and methods for better uniformity.
2013-08-01 00:44:36 +05:30
ADmad
b22b39f158
Deprecate constants IMAGES_URL, CSS_URL, JS_URL and add corresponding config values instead.
2013-07-31 18:31:26 +05:30
Mark Story
4c7bc11a08
Merge pull request #1461 from thegallagher/master
...
Required fields not recognised by FormHelper when only using ModelValidator::add()
2013-07-29 18:33:28 -07:00
David Gallagher
37ab0611ae
Fix whitespace
2013-07-30 11:26:49 +10:00
David Gallagher
35cc737261
Add for required fields when using only ModelValidator::add()
2013-07-30 11:11:49 +10:00
Marc Würth
1cac1846a3
Added missing calls to setUp & tearDown in tests
2013-07-29 01:52:39 +02:00
Phally
6b41eaa950
Merge branch 'master' into 2.4
2013-07-26 19:44:11 +02:00
Mark Story
1402796047
Merge pull request #1441 from ravage84/ViewTestsCleanup
...
Added missing test + minor cleanup of ViewTests.php
2013-07-19 19:40:09 -07:00
Marc Würth
da8e50a48a
Added missing test + minor cleanup of ViewTests.php
...
Added missing block reset test through assign().
Also made some minor cleanup in ViewTests.php. Mostly docblocks (params, returns) but also some unused variables.
2013-07-20 01:43:07 +02:00
Phally
32b818d2d8
Fixes bug in the first link of PaginatorHelper::numbers().
...
The link was the current URL instead of a link to the first
page. This only happened with named parameters. This commit
also includes a test for querystring parameters.
Refs #1432 .
2013-07-18 19:32:41 +02:00
mark_story
e03d3df0fe
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/View/HelperTest.php
lib/Cake/VERSION.txt
2013-07-17 22:40:09 -04:00
euromark
05415dd83f
do not display page:1 or ?page=1 to avoid duplicate content in paginator helper output
2013-07-17 00:45:27 +02:00
euromark
b412e2cbb1
provide ability for rounding - closes #1986
2013-07-16 15:42:08 +02:00
Adam Taylor
5a6f1259e3
Fix the "testAssetUrlNoRewrite" test
...
When running the test in the browser from somewhere other than
http://localhost (e.g. http://foo.dev ), the test was failing.
2013-07-13 23:38:55 -06:00
ADmad
d161b21ae1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
2013-07-14 10:58:55 +05:30
euromark
a643295e4c
remove @access and unnecessary $name
2013-07-08 15:50:50 +02:00
ADmad
4ded269549
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
lib/Cake/VERSION.txt
2013-07-07 12:22:12 +05:30
Christian Winther
cbb4f7db90
allow serialize in json and xml alias
2013-07-06 16:57:46 +00:00
euromark
af455b4121
correct return types in doc blocks
2013-07-05 17:19:22 +02:00
mark_story
f09693f6e8
Merge branch 'master' into 2.4
2013-06-29 23:26:26 -04:00
ADmad
75e7797a26
Allow escaping only attributes of a link and not it's title
2013-06-29 20:51:52 +05:30
Mark Story
6fdbdf508f
Merge pull request #1368 from planardothum/url-conformance
...
Url conformance
2013-06-27 06:31:42 -07:00
euromark
ee5e8c95dd
fix issue with FormHelper and undefined variable and extract
2013-06-25 12:11:10 +02:00
euromark
290c343a74
tests to disprove that input date and partial dateFormat does not work
2013-06-25 11:54:29 +02:00
euromark
d6c25bd0e3
add convenience method param() for PaginatorHelper
2013-06-24 00:03:08 +02:00
mark_story
dcf7df39d2
Merge branch 'master' into 2.4
2013-06-21 17:47:37 -04:00
Harold Putman
7acf162268
HTTP_HOST is not available in CLI
...
use FULL_BASE_URL instead.
2013-06-21 16:37:39 -04:00
Harold Putman
cfdac5e32d
Allow plus signs in URL's to pass unscathed in Helper functions.
...
According to RFC 1738 the plus sign does not have special meaning outisde of the query part of a URL.
2013-06-21 14:24:39 -04:00
mark_story
68db74d32d
Cleanup from previous commit.
...
Refs #GH-1352
2013-06-19 15:06:51 -04:00
Lucas Machado
dc3f9113b0
Fix to the date input year field
...
Create the field if no value is informed only to the maxYear and not to
the current date.
2013-06-19 15:05:15 -04:00
ADmad
12da3b1f27
Merge branch 'master' into 2.4
2013-06-16 13:07:44 +05:30
mark_story
111bfa43d4
Fix incorrect autolinking when urls end at HTML tags.
...
Fixes #3879
2013-06-15 22:01:29 -04:00
Rik van der Heijden
e7d2892e81
Fixed unit-test locales
2013-06-11 20:18:40 +02:00
mark_story
cd3c54bb9d
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-06-10 22:12:10 -04:00
euromark
4518624187
more whitespace coding standard corrections
2013-06-09 17:39:48 +02:00
ADmad
405c5b0280
Fix test
2013-06-09 18:57:09 +05:30
ADmad
636cc8c103
Merge branch 'master' into 2.4
2013-06-09 18:08:32 +05:30
euromark
394bf1054d
remove name attribute where not necessary, clean up doc blocks
2013-06-08 04:29:08 +02:00
José Lorenzo Rodríguez
3b4a4fde31
Merge pull request #1317 from lorenzo/feature/full-base-url
...
Adding App.fullbaseURL as a recognized Configure value
2013-06-05 15:12:27 -07: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
Saleh Souzanchi
ca44413689
fix Form::_selectOptions, when disabled attribute is not array so do not be disabled item of options
2013-06-01 14:16:23 +04: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
Jose Lorenzo Rodriguez
4bc92b822e
Adding App.fullbaseURL as a recognized Configure value
2013-05-30 16:07:26 +02:00
Mark Story
bed60b5d82
Merge pull request #1312 from ravage84/package-fixes
...
Fixed or removed some package/subpackage definitions to reflect director...
2013-05-29 10:14:00 -07:00
Marc Würth
e7eb09bc23
Renamed ...Controller package to ...View
...
Probably a leftover from splitting in 09e7f1d491
2013-05-29 17:20:41 +03:00
Marc Würth
29cc6b3652
Fixed or removed some package/subpackage definitions to reflect directory structure
...
Lowercase cake instead of Cake
Tests instead of Test
Fixtures instead of Fixture
2013-05-29 15:00:18 +02:00
ADmad
36c592e72e
Merge branch 'master' into 2.4
2013-05-26 11:23:53 +05:30
Gilles Wittenberg
6d996d52ce
Allow setting different type on scriptStart + scriptEnd
2013-05-21 20:14:44 +02:00
Gilles Wittenberg
f19615a3be
Allow setting different type on scriptBlock
2013-05-21 20:14:44 +02:00
Michael Tuttle
0d082b599a
changed HtmlHelper::tag() just return $text when empty($name)
2013-05-20 17:36:51 -06:00
Michael Tuttle
12462b2e51
make HtmlHelper::tag() just return the $text content with no wrapping tag when $name === false
2013-05-19 22:00:27 -06:00
ADmad
fb86859585
Merge branch 'master' into 2.4
2013-05-19 14:37:41 +05:30
euromark
97c2cb367d
CS fixes
2013-05-17 10:36:17 +02:00
mark_story
72b75660e5
Merge branch 'master' into 2.4
2013-05-16 21:31:27 -04:00
mark_story
f7d106a386
Fix FormHelper::tagIsInvalid with saveMany forms.
...
When saving multiple records validation errors were not correctly shown.
Fudge the entity path so it matches the validation errors set in the
models.
Fixes #3828
2013-05-13 21:09:31 -04:00
mark_story
bd3428e456
Remove Asset.x Configure values.
...
Having Asset.timestamp on can fail tests accidentally.
2013-05-13 21:09:31 -04:00
mark_story
c1b2ca581c
Use terser assertions.
2013-05-13 21:09:31 -04:00
mark_story
df872dde28
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-05-10 21:58:48 -04:00
mark_story
6017db9dc8
Add missing urlencoding to base/webroot.
...
This fixes URL generation when PHP_SELF or the request path contains
special characters.
2013-05-10 11:04:46 -04:00
mark_story
cdede82b7e
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Core/Object.php
2013-05-07 22:22:48 -04:00
ADmad
91319bbe7b
Fix disabled attribute check.
...
Fixes #3818
2013-05-08 01:43:27 +05:30
ADmad
a10275fb8b
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
2013-05-05 14:36:46 +05:30
mark_story
41d124d4de
Fix autoLinkUrls() not autolinking URL's without a /.
...
Refs #GH-1259
2013-04-30 17:02:07 -04:00
euromark
09d9efe235
spelling corrections (a url to an URL, unify URL)
2013-04-29 11:05:17 +02:00
mark_story
62186ac8da
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-04-28 17:00:30 -04:00
mark_story
65b1a94e63
Simplify how fullBase is calculated.
...
Using FULL_BASE_URL fixes URL generation when URL rewriting is
disabled.
Fixes #3777
2013-04-27 23:03:25 -04:00
ADmad
e11d0f829a
Added html5 required attribute for select tags too
2013-04-27 18:39:53 +05:30
ADmad
8135d405a3
Merge branch 'master' into 2.4
2013-04-27 18:39:30 +05:30
euromark
67cc7f66da
dont add required class on wrapper div
2013-04-26 15:41:35 +02:00
ADmad
19f8274a95
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-04-25 03:06:04 +05:30
mark_story
c2c096428c
Uncomment test.
...
I missed this earlier, because I'm a doofus.
2013-04-21 11:29:25 -04:00
ADmad
06a5c509c0
Merge branch 'master' into 2.4
2013-04-21 19:15:55 +05:30
mark_story
f6c3015705
Add additional tests and fix incorrect meridian selection
...
When dates around midnight were used with interval + 12hr formats, the
incorrect meridian was selected.
Refs #GH-1237
2013-04-20 14:39:47 -04:00
Majna
78ea4da681
Add test for time input with interval on first hour of the day
2013-04-20 17:51:50 +02:00
ADmad
79ad8ab95a
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Utility/File.php
2013-04-14 00:05:18 +05:30
mark_story
ed435870ae
Fix secure field lists when select elements have custom name attributes.
...
When a select element had a custom name attribute the secured field name
was incorrect.
Fixes #3753
2013-04-12 12:30:05 -04:00
ADmad
548cccbbe2
"maxlength" is not a valid attribute for input element of type "number" in html5.
2013-04-11 21:06:52 +05:30
ADmad
e55877d171
Merge branch 'master' into 2.4
2013-04-06 00:57:46 +05:30
mark_story
d8d8e9644d
Fix array('disabled') and array('disabled' => true) working differently.
...
The shortform should work the same as the longer form with regards to
disabling field locking with SecurityComponent.
Fixes #3734
2013-04-03 12:46:39 -04:00
mark_story
2d6ee3cdb1
Remove pointless code.
...
Add a missing call to parent::setUp() and remove code that it takes
care of.
2013-04-01 22:30:27 -04:00
ADmad
d809b1480e
Fix CS errors
2013-04-01 02:16:52 +05:30
mark_story
3fc627c5f8
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
lib/Cake/Error/ErrorHandler.php
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
lib/Cake/View/Helper/HtmlHelper.php
2013-03-30 22:12:27 -04:00
Renan Gonçalves
96c9174ee2
Fixing tag generation for Html::script() and Html::css() when using 'fullBase' => true.
...
Changing values on array_diff_key() from empty ('') to null as they have no consequences and offer better readability.
2013-03-29 15:24:08 +01:00
Mark
42ea6895b2
Merge pull request #1107 from TeckniX/patch-1
...
Added autoParagraph functionality to 2.4 Branch
2013-03-28 03:30:15 -07:00
mark_story
041c2d289f
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Shell.php
2013-03-26 20:31:54 -04:00
Loki
d260f4a5b3
Added autoParagraph to TextHelper with proper test cases and made it non-static
2013-03-25 11:00:37 -04:00
mark_story
37532389d6
Add test cases for GH-1182
...
Add tests for afternoon times with an interval and 12 hour time format.
2013-03-18 21:37:38 -04:00
mark_story
e97b3acebb
Merge branch 'master' into 2.4
2013-03-14 20:54:42 -04:00
Ceeram
18095ed42d
fix failing test with webrunner
2013-03-14 12:44:11 +01:00
mark_story
0900c32c03
Merge branch 'master' into 2.4
2013-03-13 21:01:03 -04:00
mark_story
f1d192f282
Fix issue with midnight hour & 12hr formats.
...
No hour would be selected in the case of 12hr formats and a time like
00:xx:yy
2013-03-13 20:56:04 -04:00
mark_story
81dc4c1e85
Merge branch 'master' into 2.4
2013-03-13 20:30:25 -04:00
mark_story
274a146b24
Move tests around.
...
Try to fix timing issues in formhelper tests.
2013-03-13 20:29:45 -04:00
mark_story
8209097bc3
Merge branch 'master' into 2.4
2013-03-09 12:40:59 -05:00
euromark
a07c9f0c3c
Fix FormHelper year range for ranges outside of 1901-2038
2013-03-05 22:11:23 +01:00
mark_story
4b13e0a5f2
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-03-04 21:55:29 -05:00
Renan Gonçalves
fd72f894ad
Expanding year range based on the provided value.
...
This solves issues where editing a record with a year outside the year range would leave the year selection empty, as now it will expand to accomodate the value.
2013-03-01 13:45:55 +01:00
ADmad
13029cc2bc
Merge branch 'master' into 2.4
2013-02-09 02:20:16 +05:30
Graham Weldon
26a08c6780
Updated copyright
2013-02-08 21:28:17 +09:00
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
euromark
d522f412db
Fix disabled elements as array for multiple select and make in_array() work properly here, fix same in_array issues for radio elements and move tests correctly - #1105
2013-02-07 15:36:00 +01:00
mark_story
1ceb17589a
Merge branch 'master' into 2.4
2013-02-06 21:05:03 -05:00
ADmad
0b46b042b9
Changed params for HtmlHelper::css() to be consistent with HtmlHelper::script().
...
Closes #3593
2013-02-05 23:22:24 +05:30
ADmad
afb62959ef
Added JSONP support for JsonView
2013-02-04 23:20:49 +05:30
Ceeram
fa1d22dc5e
added test to disprove #3588
2013-01-31 16:21:01 +01:00
euromark
ee08fe5c1f
BC fixes for disabled checkboxes
...
see: d504642
see: #3545
Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
2013-01-31 09:44:35 +07:00
Rachman Chavik
1cb24384cd
Merge branch '2.2'
2013-01-31 09:42:55 +07:00
euromark
d504642c9b
BC fixes for habtm. Closes #3545 .
...
Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
2013-01-30 21:11:41 +07:00
mark_story
78b23d8e31
Fix issue with inputs() and plugin models.
...
inputs() should not trigger errors when generating inputs for plugin
models. Previously the internal state of FormHelper was incorrect as
model() returned the plugin name instead of the modelname.
Fixes #3571
2013-01-29 22:02:21 -05:00
ADmad
422ceaff85
Added "tel" and "email" input type guessing.
...
Closes #3557
2013-01-27 08:59:54 +05:30
mark_story
4af6039107
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
mark_story
ce7f85abe8
Fix Token fields being added to GET forms.
...
They are not used so there is not much point in appending them.
Fixes #3565
2013-01-25 15:21:16 -05:00
Mark Story
bc4db91b51
Merge pull request #864 from dereuromark/2.3-radio-multiple-between
...
allow between to be an array of strings
Fixes #2859
2013-01-25 12:06:55 -08:00
mark_story
0b659d513e
Add tests for #3545
...
Fix included in GH-1075
Closes #3545
2013-01-23 21:19:37 -05:00
Mark Story
6ade91e83b
Merge pull request #1083 from ceeram/2.3-pmdvars
...
Remove unused local vars.
2013-01-23 14:51:11 -08:00
Ceeram
16be9d4990
remove unused local vars
2013-01-23 17:22:06 +01:00
ADmad
82f34c4cb3
Don't set "required" attribute for checkboxes (unless explicitly specified).
...
Adding it prevents user from submitting form with checkbox unchecked when the "boolean" validation rule is specified for the field.
Closes #3560
2013-01-23 20:38:24 +05:30
euromark
11a88042bd
fix doc block endings
2013-01-11 15:06:54 +01:00
mark_story
d0d13acaf4
Merge branch 'master' into 2.3
2013-01-08 20:15:46 -05:00
mark_story
3f21d09c1d
Fix radio() and boolean values.
...
Boolean values should be cast to integer equivalents, which allows
for correct handling of boolean columns and their string equivalents
used in form options.
Fixes #3512
2013-01-07 21:12:53 -05:00
mark_story
e132a7c856
Remove duplicated assertions.
...
These assertions are effectively duplicated in the next test method.
2013-01-07 21:00:14 -05:00
mark_story
6d743971e9
Consistently inflect theme names.
...
Themes should be consistently converted into CamelCase, this
makes the camelization consitent with the treatment in App::themePath().
Fixes #3508
2013-01-03 21:06:46 -05:00
mark_story
75f654b87b
Fix double encoding in JsHelper request methods.
...
The urls were being HTML & URL encoded, this causes issues with URL's
containing query string parameters. Remove HTML entities as they aren't
required in the Javascript context.
Fixes #3495
2013-01-02 23:09:37 -05:00
ADmad
367463f4c1
Added disabledTag
option.
...
Closes #3108
2012-12-24 20:48:44 +05:30
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
José Lorenzo Rodríguez
a8bd7c6678
Merge pull request #961 from dereuromark/2.3-unify-object-collection
...
2.3 unify object collection
2012-12-22 14:24:26 -08:00
ADmad
8ef2c22c29
Added "required" attribute to input element based on validation rules for field
2012-12-21 23:20:40 +05:30
ADmad
d16a9ab98e
Fix error when no model scope is set
2012-12-20 02:32:24 +05:30
Vinícius Krolow
00ea427383
When you are showing a related model field in paginator sort it will display more friendly. eg: $this->Paginator->sort('Text.label') will retorn as Text Label
2012-12-17 01:55:03 -02:00
Mark Story
408f9dd3b0
Merge pull request #1018 from dereuromark/2.3-postlink-target
...
Put target attr on correct element when using postLink()
2012-12-15 06:58:14 -08:00
mark_story
6f5ff4d7dd
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
2012-12-13 20:20:42 -05:00
euromark
ae7f629eff
correct target attribute for postLinks
2012-12-12 11:23:41 +01:00
Ceeram
a8eca60fc5
fix coding standards
2012-12-10 17:40:12 +01:00
Ceeram
a15481bbe9
starting refactor Form->input
2012-12-10 10:51:39 +01:00
mark_story
2a8ebcea60
Exclude value attribute from generated file inputs.
...
Having a value attribute present causes HTML validation errors in HTML5
doctypes. It has no effect in other doctypes, and excluding it is always
valid.
Fixes #3440
2012-12-09 13:31:01 -05:00
mark_story
b1aa75bec0
Fix coding standards.
2012-12-07 22:06:15 -05:00
euromark
881127ef4d
unify new lines at the end of the file
2012-12-05 15:00:24 +01:00
José Lorenzo Rodríguez
99e84b8a08
Merge pull request #930 from LiquidityC/2.3_3315_viewblock_startifempty
...
Added: View::startIfEmpty($name)
2012-12-01 14:06:55 -08:00
José Lorenzo Rodríguez
dfb154464e
Merge pull request #994 from dereuromark/2.3-missing-elements
...
make View trigger notice if elements are missing.
2012-12-01 13:38:54 -08:00
José Lorenzo Rodríguez
dc370826af
Merge pull request #918 from bar/2.3-form-empty-error
...
Calling Form->input() with 'errorMessage'=> false should trigger field error, but not render error element.
2012-12-01 13:09:35 -08:00
euromark
e1e4d93134
make View trigger notice by default if elements are missing
...
and add elementExists() method
2012-11-30 14:11:45 +01:00
ADmad
4a6ebaa07b
Added Helper::$settings
2012-11-30 12:19:40 +05:30
mark_story
739982addb
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/View/Helper.php
2012-11-25 23:33:16 -05:00
mark_story
1f35d82c81
URL encode image/script/css/video paths.
...
Properly urlencode urls used in HTML attributes. This solves issues with
invalid HTML being generated when paths contain special characters.
Fixes #3395
2012-11-25 23:31:22 -05:00
mark_story
3ba2db738f
Re-work MediaViewTest
...
it was duplicating many of the tests in CakeResponse, and missing a
few of the cases in MediaView itself.
2012-11-24 16:29:39 -05:00
mark_story
82d20ed948
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-24 15:44:52 -05:00
mark_story
e04e0a0ec8
Use non-mocked methods for tests
...
This makes reducing off by 1 second errors much easier.
2012-11-24 13:34:12 -05:00
Ceeram
eadc3a75e5
fix coding standards
2012-11-21 15:39:03 +01:00
mark_story
27d7e2865e
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
ceeram
4611c987db
Merge pull request #959 from ceeram/phpcsw
...
Make phpcs pass
2012-11-19 15:10:47 -08:00
ADmad
165035faa8
Merge pull request #963 from sarce/paginator-tag
...
prev() and next() methods of PaginatorHelper now possible to place the 'tag' option to 'false' for disable the wrapper.
2012-11-18 22:41:10 -08:00
Linus Probert
d6bf0dc003
Added additional test for View::startIfEmpty($name)
2012-11-18 16:30:47 +01:00
mark_story
c504fcfdf0
I'm a tool, fix test and remove debug().
2012-11-17 14:57:03 -05:00
mark_story
a3ddff4aa7
Fix failing test & simplify code.
2012-11-17 14:51:57 -05:00
Mark Story
c752b75904
Merge pull request #958 from planardothum/feather
...
Frameworks compatible Breadcrumbs.
2012-11-17 11:23:43 -08:00
Sebastián Arce
d0d15701b3
prev() and next() methods of PaginatorHelper now possible to place the 'tag' option to 'false' for disable the wrapper.
2012-11-17 15:26:08 -03:00
Ber Clausen
1c281c9a2b
Calling Form->input() with 'errorMessage'=>false should trigger field
...
error, but not render error message (HTML element).
2012-11-16 15:02:01 -03:00
planardothum
4351b78639
Change more spacing issues.
2012-11-16 06:39:13 -05:00
euromark
8acdb129b2
unify object load/unload and loaded methods
2012-11-16 12:14:28 +01:00
planardothum
bed9ba22cc
Fix spaces around operators.
2012-11-15 20:15:49 -05:00
ADmad
f7e66da6fc
Fix derpness of fieldset
and legend
options being mashed inside $fields param array.
2012-11-15 11:22:04 +05:30
mark_story
a7f192c606
Merge branch 'master' into 2.3
2012-11-14 21:50:29 -05:00
mark_story
58de6702bc
Fix notice errors when creating fields named 0.
...
Fixes #3371
2012-11-14 21:27:12 -05:00
Ceeram
e02eab05d5
Remove all todo from core, create tickets for them
2012-11-14 14:59:51 +01:00
Ceeram
56225bcca3
fix all warnings except TODO warnings
2012-11-14 12:56:10 +01:00
planardothum
a0f323eb4c
Add frameworks compatible Breadcrumbs.
...
New options in HtmlHelper::getCrumbList() to make it compatible with Twitter Bootstrap, Zurb foundation or other CSS frameworks.
2012-11-13 20:19:29 -05:00
Lawrence Barsanti
a60a730e7e
XmlView: configure top level element name
...
Allow the top level element name to be configured by setting
XmlView.RootNodeName.
2012-11-04 21:21:35 -05:00
ADmad
fa5ccf46d0
Fix coding standard errors
2012-11-04 02:52:00 +05:30
mark_story
60f9626838
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-02 16:52:51 -04:00
Linus Probert
03176c6c8c
Added test for View::startIfEmpty($name)
2012-11-02 21:29:31 +01:00
mark_story
118dd8c534
Make fragile test less fragile.
2012-11-01 21:36:14 -04:00
ADmad
26d8351af4
Fixing "required" field detection again. Closes #3305
2012-11-01 05:04:37 +05:30
Jose Lorenzo Rodriguez
8bca041066
Revert "Fixing failing test case in RssHelper"
...
This reverts commit 7715689523
.
2012-10-28 20:48:31 +01:00
Jose Lorenzo Rodriguez
7715689523
Fixing failing test case in RssHelper
2012-10-28 11:52:30 +01:00
mark_story
c24bec679b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/View/Helper/FormHelper.php
2012-10-27 21:13:53 -04:00
Ber Clausen
a7d9422c09
Test all empty array with assertSame() because assertEquals() does not check the type.
2012-10-26 19:21:51 -03:00
ADmad
0ddd130833
Improved "required" field detection. Closes #3305 .
2012-10-26 12:58:24 +05:30
mark_story
c359e4b689
Fix issue with array based values and interval.
...
Fixes #3299
2012-10-25 20:46:54 -04:00
Mark Story
555bfc32ea
Merge pull request #909 from dereuromark/master-magic-input-bc
...
Master magic input bc
Fixes #3295
2012-10-25 07:05:31 -07:00
mark_story
5786245832
Fix lint error.
2012-10-24 21:21:11 -04:00
mark_story
d2010308d4
Merge branch 'master' into 2.3
2012-10-23 20:20:52 -04:00
mark_story
3729ac1f2f
Fix issue where the incorrect meridian would be selected.
...
When combining 12 hour format, interval and afternoon times, the
incorrect meridian would be selected. Moving the hour math into
FormHelper::hour() makes that method generally more correct and lenient
on its input.
Fixes #3299
2012-10-23 12:47:12 -04:00
euromark
044cf60b69
move the test case to its own method
2012-10-23 16:07:43 +02:00
euromark
5064601c6f
adding test case
2012-10-23 15:11:23 +02:00
mark_story
1aea9ac0c9
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Event/CakeEventManager.php
lib/Cake/VERSION.txt
lib/Cake/View/ViewBlock.php
2012-10-15 21:46:49 -04:00
ADmad
56a0eb04b7
Fix incomplete patch 61dd1098d3
2012-10-14 18:44:10 +05:30
ADmad
61dd1098d3
Allow specifying tag for current page number. Closes #2892
2012-10-13 12:34:00 +05:30
mark_story
8800d7bdec
Reduce duplication in test case.
2012-10-11 08:28:59 -04:00
mark_story
b1dfab87e4
Fix autoLinkUrls so it re-capture query strings.
...
Fixes #3296
2012-10-11 08:28:59 -04:00
mark_story
57681ff115
Fix code style errors.
2012-10-09 13:20:53 -04:00
mark_story
a3ae58da09
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/View/View.php
2012-10-01 21:20:25 -04:00
ADmad
47708c52cd
Allow content to be added before existing content in view block.
2012-10-02 00:11:54 +05:30
mark_story
c94886a988
Add missing import that causes tests to fail in isolation.
2012-09-30 22:51:19 -04:00
mark_story
affb3192ad
Fix issue where including elements + extending views fails.
...
If you include an element before calling extend(), the parent view
will be assumed to be an element instead of a view/layout.
Fixes #3248
2012-09-30 22:44:27 -04:00
mark_story
80c355baa5
Make minutes/hours wrap around correctly.
...
Also account for times around midnight that roll over days/months/years.
Fixes #3242
2012-09-28 22:50:46 -04:00
Jose Lorenzo Rodriguez
d5c9d97dc1
Merge remote-tracking branch 'origin/master' into 2.3
...
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
euromark
7aa78c40f3
test case to proof that less between strings also work and do not error
2012-09-21 02:57:10 +02:00
euromark
490bbf836d
remove debug statement
2012-09-21 00:09:42 +02:00
euromark
bfaed32e58
allow between to be an array of strings
2012-09-21 00:06:26 +02:00
mark_story
0f0b5e7668
Fix incorrect radio selection with falsey values.
...
Use strval() to work around 0 == '' type issues.
Cleanup some tests.
Fixes #3221
2012-09-19 10:14:29 -04:00
mark_story
5d830d7adb
Fix multiple selects always failing post validation.
...
Fixes #3218
2012-09-18 14:41:51 -04:00
Tigran Gabrielyan
d30e092966
Fixed test case
2012-09-18 00:46:06 -07:00
Tigran Gabrielyan
f1a344eee4
Added test case for view block default value
2012-09-18 00:41:33 -07:00
mark_story
99a9cc9669
Fix required field detection.
...
Fix required field detection to match documentation and behavior when
validating. Having `allowEmpty` in the first validation rule, makes the
field not 'required' as the field is allowed to be empty.
Fixes #3194
2012-09-11 21:59:46 -04:00
mark_story
6664acba79
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-09-05 20:15:36 -04:00
ADmad
28951865c6
Hidden divs created by FormHelper can now be customized.
2012-09-04 23:56:30 +05:30
mark_story
0d826528e1
Supress fewer errors.
...
PHPUnit raises exceptions on errors, there isn't much point in
supressing all these errors.
2012-09-03 20:13:30 -04:00
mark_story
771cfde196
Fix coding standards.
2012-09-03 20:09:13 -04:00
Mark Story
eb33929829
Merge pull request #731 from dereuromark/2.3-fix-rss-test
...
2.3 fix rss test
2012-09-03 15:03:44 -07:00
brq
fca98e39f9
Allow postLink() to support other HTTP methods; it defaults to POST
2012-09-02 12:57:35 -05:00
mark_story
728300786b
Merge branch 'master' into 2.3
2012-08-30 19:43:11 +01:00
mark_story
cbb64bd082
Fix blackhole requests with empty select boxes.
...
When a select box was entirely empty (no option element)
secured form submission should not fail.
Fixes #3153
2012-08-26 22:53:48 -04: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
mark_story
c83e941497
Merge branch 'master' into 2.3
2012-08-15 21:00:49 -04:00
ADmad
65e63c51c8
More missing parent calls.
2012-08-12 02:28:12 +05:30
ADmad
802f00b6e3
Adding missing calls to parent.
2012-08-12 02:13:10 +05:30
ADmad
4a483b4897
If cache is disabled in app and js cache file is not written don't return script tag with file url.
...
Instead return script block with inline js content.
2012-08-12 01:08:05 +05:30
mark_story
b32273e713
Fix whitespace errors.
2012-08-04 15:57:04 -04:00
mark_story
e59555a66f
Merge branch 'master' into 2.3
2012-08-03 22:45:56 -04:00
euromark
a208eb6cb1
fixes disabled attribute for multiple checkboxes
2012-08-02 21:35:05 -04:00
euromark
64ba8c6b6e
remove debug statement
2012-08-02 10:18:14 +02:00
euromark
319658e9d3
asserting escaped output for sms protocol
2012-08-01 12:48:21 +02:00
euromark
b6fe8af701
adding sms as protocol
2012-08-01 12:38:06 +02:00
euromark
2a674fc461
adding a test for the yet untested javascript protocol
2012-08-01 12:14:46 +02:00
euromark
f0ffe098d3
adding html helper tests for special protocols
2012-08-01 12:11:05 +02:00
Schlaefer
af8c5716fc
Added test for RSS to allow namespace tags if namespace is specified
...
If a namespace prefix is defined it's prefix should not be stripped
from the tag: `<dc:creator>` stays `<dc:creator>`.
Other prefixes are still stripped from the tag name.
This test is missing in 19f0e72d58
2012-07-30 10:10:19 +02:00
mark_story
7b939186a1
Fix ( and ) not being correctly handled by autoLinkUrls
...
Fixes #3077
2012-07-29 21:18:33 -04:00
Schlaefer
19f0e72d58
fix #2858 RSS helper bug with namedspaced keys
...
http://cakephp.lighthouseapp.com/projects/42648/tickets/2858-rss-helper-bug-with-namedspaced-keys
2012-07-29 14:24:46 +02:00
mark_story
d94cdc67fe
Merge branch 'master' into 2.3
2012-07-27 22:38:24 -04:00
ADmad
99813e97b3
Implemented feature to allow individual "empty" values for date time select elements
2012-07-28 01:47:21 +05:30
euromark
15cf55d444
different approach on the failing test
2012-07-22 03:59:59 +02:00
euromark
93957bc3e4
fix for windows. the check seems to be the wrong way. at least compared to the one in the rss class itself
2012-07-22 03:55:13 +02:00
mark_story
3c6b50953b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-07-18 22:12:51 -04:00
ADmad
69eba678f4
Deprecated MediaView and updated MediaView::render() to use CakeResponse::file()
2012-07-11 01:40:42 +05:30
mark_story
369bbcc964
Fix failing tests.
...
* New properties on view caused fails in Debugger.
* Element cache keys have changed with the new refactoring.
2012-07-07 01:08:39 -04:00
mark_story
e61f636bc7
Fix double base dir in image() with fullBase.
...
Fixes #2991
2012-07-03 20:48:17 -04:00
euromark
ba62ecd21a
whitespace
2012-06-12 16:59:16 +02:00
euromark
b32edfe378
fix double-encoding of external urls
2012-06-12 16:30:37 +02:00
mark_story
fceb028499
Fix code style errors.
2012-06-03 21:11:34 -04:00
mark_story
55c4ad3c1c
Fix coding standards errors.
...
Also remove count() calls in TreeBehavior.
2012-05-31 21:20:11 -04:00
Mark Story
119377422e
Merge pull request #674 from colares/ticket-2787
...
Add table attributes per column
Fixes #2787
2012-05-30 18:29:56 -07:00
mark_story
9a8ceaeba6
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/View/XmlViewTest.php
2012-05-30 21:20:56 -04:00
Thiago Colares
fad7b0705f
Increasing testTableHeaders case
2012-05-29 23:30:06 -03:00
Ceeram
25c7a27495
fixing XmlView, XmlException: Invalid input was raised when _serialize is string and data is numerically indexed.
2012-05-29 09:46:00 +02:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
Tigran Gabrielyan
1d77ad393c
Added FormHelper::inputDefaults setter/getter method
2012-05-20 13:41:55 -07:00
Jelle Henkens
97ebbc8e23
Fixing coding conventions
2012-05-19 16:08:40 +01:00
mark_story
4dc07b6d39
Merge branch '2.1' into 2.2
2012-05-16 21:08:06 -04:00
mark_story
0faaedfff5
Split up tests.
...
Fix API usage in tests.
2012-05-14 21:32:31 -04:00
mark_story
a80a7dadf8
Re-factor element generation.
...
Add the ability for arbitrary attributes.
Use built-in methods for attribute generation.
Add tests for element generation.
2012-05-12 22:26:33 -04:00
mark_story
4f12f254f4
Add test for element.
2012-05-12 22:26:33 -04:00
Jose Lorenzo Rodriguez
bf0f5ab118
Merge remote-tracking branch 'origin/2.1' into 2.2
2012-04-29 20:05:39 -04:30
Kyle Robinson Young
b8488b8dfe
Update 1.x @link in docblocks
2012-04-26 19:49:18 -07:00
mark_story
4ffca8457e
Fix coding standards.
2012-04-24 20:09:39 -04:00
Ceeram
74ee75b0ef
Merge branch '2.1' into 2.2
2012-04-23 10:34:04 +02:00
Jose Lorenzo Rodriguez
ed0c5a4746
Merge branch '2.2-lazy-helpers' into 2.2
2012-04-22 20:40:11 -04:30
Jose Lorenzo Rodriguez
8465538800
Merge branch '2.2-middleware' into 2.2
2012-04-22 17:17:36 -04:30
mark_story
7846254c63
Remove more copy + paste in tests.
2012-04-21 21:31:24 -04:00
mark_story
88465cbb47
Remove copy + paste in tests.
2012-04-21 21:17:28 -04:00
euromark
bc2cd00123
cake 2.2 test case fixes (assert corrections, correct class names)
2012-04-21 15:02:35 +02:00
mark_story
2480ee1beb
Fix coding standards.
2012-04-20 20:52:10 -04:00
euromark
da3b424838
Fixed several fails in the tests concerning windows. Especially in AllConsole
2012-04-20 16:38:50 +02:00
mark_story
21ba5bf04a
Merge branch '2.1' into 2.2
2012-04-17 21:47:24 -04:00
mark_story
94e83fa81c
Fix invisible buttons.
...
Fixes #2802
2012-04-17 20:46:19 -04:00
Jose Lorenzo Rodriguez
05b88f3f0e
Fixed another failing test case
2012-04-15 12:52:34 -04:30
mark_story
5bb8c3a942
Fix code standards.
2012-04-14 10:49:25 -04:00
mark_story
0f2100767b
Add failing test for #2661
2012-04-14 10:24:20 -04:00
Kyle Robinson Young
8bbe250bec
Correct method descriptions and remove unused property
2012-04-11 07:50:54 -07:00
mark_story
9f9feec222
Merge branch '2.2-hash' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
mark_story
f8966a64f2
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
2012-04-09 21:55:02 -04:00
mark_story
81208d1fa7
Fix failing test.
2012-04-09 21:46:38 -04:00
mark_story
67743c8079
Fix missing Html escaping on string urls for assets.
...
Add HTML escaping for asset paths provided as strings.
Split existing tests up.
Fixes #2766
2012-04-09 21:20:11 -04:00