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
Majna
5250c92635
Fix Hash::sort() 'natural' type fallback on PHP < 5.4
2013-01-25 01:07:45 +01:00
mark_story
e4f241dd23
Merge branch 'pr-1075'
...
Merge changes in pull request 1075.
2013-01-23 21:19:53 -05: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
mark_story
0cdef75060
Fix failing tests.
...
I have no idea why the updated session test was expected to fail as the
data was written to the session.
Refs #3551
2013-01-21 21:13:35 -05:00
mark_story
75495705a6
Fix Hash::get($data, '0')
...
Fixes #3555
2013-01-21 20:50:46 -05:00
mark_story
7790bcacff
Allow afterFind() to fully remove an associated record.
...
By returnning array() or unsetting the 0'th result an afterFind
callback should be able to fully remove data from the results.
Fixes #3541
2013-01-17 20:35:37 -05:00
mark_story
773666ddad
Fix coding standards and save a function call.
2013-01-17 20:34:25 -05:00
Mark Story
acc6a2645f
Merge pull request #1039 from bfanger/master
...
Fixes an issue with urls as GET parameters
2013-01-17 17:31:59 -08:00
Renan Gonçalves
23d4807933
Fixing expected value from find when it results in failure.
...
When a behavior callback (eg: beforeFind) stops the event, find will return null. False is really never returned from find().
2013-01-17 13:00:56 +01:00
Mark Story
70171f5403
Merge pull request #1073 from cakephp/issue-3533
...
Partially revert default niceShortFormat
The changes introduced in 2.2 dramatically changed the output from 2.1, this change attempts to be a compromise between the 2.1 format and the 2.2 format.
Fixes #3533
2013-01-16 18:08:44 -08:00
mark_story
95ed471c41
Reduce duplication in code.
...
This will result in all tests being skipped when any of the required
models pre-exists.
2013-01-16 12:59:13 -05:00
mark_story
5a6a45d0d1
Add support for --admin to bake controller all.
...
I missed this when originally implementing bake controller all.
Fixes #3536
2013-01-16 12:57:18 -05:00
mark_story
ad0d6644c4
Partially revert default niceShortFormat
...
In 9fa531d6e3
the default niceShortFormat
was changed, which has been interpreted as a regression in #3533 .
This change partially reverts the previous change and tries to strike
a balance between the old behavior and new.
Refs #3533
2013-01-14 21:12:11 -05:00
mark_story
9c29fab4a4
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Network/Http/HttpResponse.php
2013-01-14 20:24:56 -05:00
U-Zyn Chua
bcdbdc8108
Add OK or Successful HTTP codes 200-206 to HttpResponse::isOK(). Fixes #3531
2013-01-15 09:17:24 +08:00
ADmad
d8551c49e5
Improve messages logged for exceptions
2013-01-12 11:30:25 +05:30
ADmad
676872d623
Allow AuthComponent::$unauthorizedRedirect to be an url.
...
Closes #3494
2013-01-12 11:25:13 +05:30
Mark Story
e7330fa585
Merge pull request #1067 from ceeram/paginatecount
...
Avoid calling paginateCount when there are no results.
2013-01-11 18:09:32 -08:00
José Lorenzo Rodríguez
d571b056f4
Merge pull request #1063 from ADmad/2.3-cakeplugin
...
Added feature to ignore include errors for CakePlugin
2013-01-11 15:13:54 -08:00
dogmatic69
bcb3eb89dc
Before this change 0.00 and '0.00' are treated differently. Floats from the database are returned as the string
...
version while doing calculations will normally end up as floats.
This causes output differences on pages like order totals or invoices where there is a mix of calculated values
and database values.
Number::currency(0.00, 'GBP') -> £0.00
Number::currency('0.00', 'GBP') -> 0p
Both versions will return `£0.00` (or whatever 0 is configured to return).
2013-01-11 17:00:06 +00:00
euromark
11a88042bd
fix doc block endings
2013-01-11 15:06:54 +01:00
Ceeram
92d9b11aee
fix double semicolon
2013-01-11 11:15:15 +01:00
Ceeram
d3f9cc10b5
fix failing test
2013-01-10 18:10:24 +01:00
mark_story
7008b812be
Fix string '0' not being exported correctly.
...
Fixes #3518
2013-01-09 23:04:58 -05:00
mark_story
735517ade1
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2013-01-08 22:27:17 -05:00
mark_story
e3692225ff
Fix lint errors.
2013-01-08 22:26:43 -05:00
mark_story
d0d13acaf4
Merge branch 'master' into 2.3
2013-01-08 20:15:46 -05:00
mark_story
c2e087dc9b
Add test for recursion issues in Hash::expand().
...
Refs #3080
2013-01-08 19:42:12 -05:00
ADmad
970fdca89d
Added feature to ignore include errors for CakePlugin
2013-01-09 01:08:42 +05:30
euromark
a266d8bede
add test case
2013-01-08 13:06:02 +01: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
mark_story
83abced287
Add tests for save() and multiple locales.
...
Refs #3498
2012-12-29 11:57:52 -05:00
mark_story
4c98e39c1f
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Controller/Component/SecurityComponent.php
2012-12-29 11:44:59 -05:00
mark_story
1117ad2f1c
Blackhole requests when the action is the blackhole callback.
...
When a user requests the blackhole callback as an action we should
blackhole that request. The blackhole callback should not be URL
accessible.
Fixes #3496
2012-12-29 11:43:06 -05:00
Majna
6d75d90c25
Code cleanup
...
Remove unneeded sprintf.
Fix doc blocks.
Remove duplicated keys in tests assertions.
Use boolean value for CakeRequest $parseEnvironment param.
2012-12-28 23:37:58 +01:00
ADmad
fd16b8a1e5
Throw exception if requested page number is out of range.
...
Closes #3459
2012-12-28 01:37:25 +05:30
Graham Weldon
a9293aa385
Merge remote-tracking branch 'origin/master' into 2.3
...
Conflicts:
lib/Cake/Console/Templates/skel/Config/core.php
2012-12-27 22:42:18 +09:00
Jose Lorenzo Rodriguez
9cc4371246
Revert "Merge pull request #1050 from rynop/2.3"
...
This reverts commit f3f1e1ab52
, reversing
changes made to 9fc4678fa3
.
2012-12-27 13:55:25 +01:00
mark_story
965f0e87c5
Fix SQL errors in TreeBehavior.
...
SQL errors were caused by escapeField() usage in TreeBehavior. Quoted
fields were not correctly unquoted.
Fixes #3491
2012-12-26 20:55:07 -05:00
Ryan
1881ff1664
Fix testClear() case
...
After clear of memcache config, all keys should be gone. So a read on a key should return false.
2012-12-26 16:34:23 -06: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
fce07bd5b8
Fix failing test
2012-12-23 03:32:25 +05:30
José Lorenzo Rodríguez
29f6e13a28
Merge pull request #1007 from dereuromark/2.3-response-charset
...
not just json should send the charset
2012-12-22 14:00:58 -08:00
José Lorenzo Rodríguez
9f5549a7eb
Merge pull request #1037 from ADmad/2.3-formhelper
...
Added "required" attribute to input element based on validation rules fo...
2012-12-22 13:51:40 -08:00
ADmad
a340c19c08
Added support for php.ini style values
2012-12-23 02:25:59 +05:30
Bob Fanger
13dc397172
Added unittest for REQUEST_URI with multiple FQDNs.
2012-12-21 19:59:55 +01:00
ADmad
8ef2c22c29
Added "required" attribute to input element based on validation rules for field
2012-12-21 23:20:40 +05:30
Bob Fanger
b7b6859c27
Fixes corrupted CakeRequests when a $_GET value contains "://"
2012-12-21 16:12:51 +01:00
euromark
910e21e65e
a few more application contents should send the charset
...
adding content type tests as dataprovider
2012-12-21 12:32:32 +01:00
mark_story
554d5794ce
Merge branch 'master' into 2.3
2012-12-19 21:18:52 -05:00
mark_story
08cde9f5a2
Fix foreach error when useTable = false.
...
When calling model->create() with useTable = false, an error should not
be triggered.
Fixes #3480
2012-12-19 21:18:34 -05:00
ADmad
d16a9ab98e
Fix error when no model scope is set
2012-12-20 02:32:24 +05:30
mark_story
7ad11f59bb
Change line length in emails.
...
Use LINE_LENGTH_MUST instead of LINE_LENGTH_SHOULD. This
fixes a number of text wrapping issues caused by the narrower wrap
length.
Fixes #3151
Fixes #3473
2012-12-17 20:54:38 -05:00
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
4bdaa2b5a0
Merge branch 'master' into 2.3
2012-12-16 13:32:38 -05:00
mark_story
1528b5c382
Don't return true when there is nothing to save.
...
Model::save() should not return true when no work has been done.
Fixes #3469
2012-12-16 13:19:14 -05: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
dogmatic69
2266292594
fixing bug in Hash where array is not similar to the path required
2012-12-14 22:45:52 +00: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
Mark Story
45f6ade800
Merge pull request #997 from rhelms/2.2.5-text-index-in-fixture
...
Cater for length part of TEXT field in indexes for MySQL'
Fixes #3428
2012-12-12 17:27:30 -08:00
Reuben Helms
07dbc4a527
Cater for length part of TEXT field in indexes for MySQL
...
Cater for length on TEXT column in index for _alterIndexes
Handle nested arrays in schemas
Used when writing indexes containg TEXT field for MySQL
Change comment style from code review
Remove stray space
Only generate length part of TEXT index column field when necessary
Override buildIndex() in Mysql instead of name()
Revert DboSource::buildIndex to previous state
Update Mysql::_alterIndexes for code reuse
Update MysqlTest to handle quoted index names.
Make code clearer, as per code review
Adjust function comments, as per code review
2012-12-13 08:33:43 +10:00
euromark
ae7f629eff
correct target attribute for postLinks
2012-12-12 11:23:41 +01:00
mark_story
b20f6e132d
Add test for options with 0 value.
2012-12-10 22:10:00 -05: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
1e49be3472
Fix stack traces not being highlighted correctly.
...
Fixes #3439
2012-12-08 20:48:45 -05:00
mark_story
b1aa75bec0
Fix coding standards.
2012-12-07 22:06:15 -05:00
mark_story
8b0a7ee13d
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-12-07 20:53:10 -05:00
dogmatic69
85de93a4a7
fixing issue where merge is renumbering array keys
2012-12-07 01:26:14 +00:00
euromark
881127ef4d
unify new lines at the end of the file
2012-12-05 15:00:24 +01:00
mark_story
002700071d
Fix incorrectly quoted fields when using the || operator.
...
Fixes #3404
2012-12-02 20:59:56 -05:00
Saleh Souzanchi
d5283af818
fixed utf-8 pattern in router option
2012-12-02 16:30:45 +03:30
Jose Lorenzo Rodriguez
c1551d9828
Merge branch 'master' into 2.3
2012-12-02 00:34:55 +01:00
Jose Lorenzo Rodriguez
da4fdbac3a
Fixing failing test case
2012-12-02 00:34:26 +01:00
Jose Lorenzo Rodriguez
0f5fa290ed
Merge remote-tracking branch 'origin/master' into 2.3
2012-12-01 23:19:53 +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
mark_story
479aefc438
Update TLD validation to accept gTLD variations
...
The upcoming gTLD extensions will allow much more variety in TLD names.
Loosen the validation to better accept different length TLDs.
Fixes #3414
2012-11-30 22:11:57 -05:00
mark_story
889c1ebc09
Fix sorting empty data with Hash & Set.
...
Fixes #3420
2012-11-30 13:05:14 -05: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
ADmad
1de8ed18de
Avoiding specifying 'maxLimit' too when setting 'limit' greater than default 'maxLimit' in code.
2012-11-30 11:26:10 +05:30
Mark Story
68976a028e
Merge pull request #990 from beeman/minor-js-fix
...
Minor js fix, makes two files in test suite valid JavaScript
2012-11-29 18:10:40 -08:00
Thomas Ploch
7f0085cd4e
Added type hinting to Model::validator()
...
Added missing param and fixed typo in method's phpdoc.
Used 'assertSame' and 'assertNotSame'. Removed piped NULL type from phpdoc.
Simplify condition in Model::validator()
2012-11-28 21:32:00 -05:00
mark_story
ffcf71c810
Merge branch 'master' into 2.3
2012-11-28 21:30:15 -05:00
mark_story
f250592fee
Fix multi-model validators with deep & atomic.
...
Apply patch from 'Christian Buffin' to fix validateMany() and
validateAssociated() when atomic=false & deep=true are used in
conjunction. Using Hash to flatten the nested set of validation results
yields the correct results.
Fixes #3352
2012-11-28 21:26:40 -05:00
mark_story
35d67bf4a8
Merge branch 'master' into 2.3
2012-11-28 21:00:30 -05:00
Bram Borggreve
f69fe20376
Makes sure these two files are valid JavaScript by adding comment marks
...
to them, this way editors (NetBeans 7.3 for instance) stop marking them
invalid.
2012-11-28 15:29:50 +01:00
mark_story
966c69cb98
Fix missing plugin parameters in scaffolding.
...
Add missing plugin parameter to scaffolded associations.
This improves link generation and correctness overall.
Fixes #3396
2012-11-27 21:59:06 -05:00