Commit graph

433 commits

Author SHA1 Message Date
gwoo
643651fe56 Merge master in 1.3 2009-03-19 14:10:13 -07:00
gwoo
6cb8b3d286 Merge branch 'master' into 1.3.x.x 2009-03-14 13:57:18 -07:00
nate
36d3540c19 Adding native-type-generation fixes for JavascriptHelper::object()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8095 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-13 14:49:00 +00:00
gwoo
de6541f658 fixes #6189, paginator sort direction for associated fields of the same name
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8092 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-12 17:11:08 +00:00
mariano.iglesias
fdbf102228 Fixing issue where disallowing plugin was not possible in PaginatorHelper, fixes #6159
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8090 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-11 19:24:06 +00:00
mark_story
c164be8c03 Enabling Asset.timestamp for HtmlHelper::image() making it consistent with Javascript::link().
Tests added.
Fixes #6170

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8078 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-06 04:40:50 +00:00
mark_story
18a7115385 Adding test to show proper escaping of escaped strings in Javscript::object() closes #6167.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8076 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-06 03:53:31 +00:00
jperras
79cba70758 Updating number helper to allow output of main currency symbol in the 'after' slot. Also added some basic i18n for NumberHelper::toReadableSize Fixes #6150.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8069 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-03 15:32:12 +00:00
mark_story
0be4f64801 Adding test cases for URL encoded values. Refs #6134
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8062 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-25 20:01:55 +00:00
mark_story
af021cb4b2 Adding Html entity conversion to all urls generated by helpers, fixing potential for merged passedArgs to create xss vectors.
Adding integer cast in paginate() to page param. 
Tests added/updated.
Fixes #6134

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8061 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-25 19:51:41 +00:00
the_undefined
74bf622866 Fixes #6071
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8053 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-23 15:19:33 +00:00
gwoo
f0d03a91cf Merge branch 'master' into 1.3.x.x 2009-02-09 12:01:06 -08:00
nate
c2f111a45a Standardizing format string in PaginatorHelper::counter(), %page% becomes {:page}, old keys still work, but will be deprecated 2009-02-07 08:41:15 -05:00
mark_story
2da0c208d5 Fixing Helper::value() when only a fieldname is used. Refactoring Helper::value() to reduce method calls. Added tests to Helper. Fixes #6033
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8012 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-26 19:45:55 +00:00
renan.saddam
b5d7f182a0 Disproving FormHelper::textarea always escapes value. Closes #6016.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8006 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-21 01:15:29 +00:00
mark_story
b94a85e938 Altering Helper::url() to enforce escaped query strings for generated urls.
Tests added to Html::link().  Fixes #5982

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7991 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 22:41:47 +00:00
TommyO
de1d1ae3bd Fixed asset.timestamp inconsistency for css files.
Added tests to confirm css linking.
Closes #5990. Fixes #5991

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7990 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 22:19:11 +00:00
mark_story
287968934f Fixing next()/prev() when paginating multiple models. Added tests from 'hummer'. Fixes #5970
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7989 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 22:08:11 +00:00
mark_story
7b12272253 Fixing issues with am times and form test.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7975 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-13 18:42:08 +00:00
mark_story
79c791548f Fixing formHelper::hour when specifying a strtotime compatible string for the selected value. Tests added Fixes #5941
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7967 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-30 16:20:38 +00:00
nate
ad208ff8c3 Refactoring previous fix to revert markup changes in HtmlHelper, updating FormHelper tests to comply with coding standard, correcting bad assertions, fixing issue with field types being mis-identified if duplicate names are used, fixes #5919
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7959 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-25 22:13:06 +00:00
nate
61850b1be1 Cleaning up test code formatting, adding fix for POST hash validation of checkbox lists, fixes #5903, test cases added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7951 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-23 08:13:00 +00:00
mark_story
60e3c6caa4 Removing unecessary Mock object creation.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7949 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-22 04:31:21 +00:00
mark_story
943bb53dda Correcting callback firing of helpers in view. Tests added fixes #5906
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7948 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-21 22:14:48 +00:00
mark_story
9071d8165f Correcting generation of id attributes for radio buttons. Tests added, fixes #5891
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7924 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-17 01:49:58 +00:00
mark_story
8c51d72ed8 Adding tests to disprove #5855. Closes #5855
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7911 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-09 18:49:00 +00:00
mark_story
090028403b Fixing FormHelper dateTime creation when using custom empty strings and null values. Tests added. Fixes #5769
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7898 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-29 00:28:31 +00:00
mariano.iglesias
f9557c7611 Fixing issue where radio elements would produce wrong hash when Security component enabled in FormHelper, fixes #5791
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7891 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-25 16:32:54 +00:00
phpnut
69f883a89f Adding $data['attrib'] back to RssHelper::channel(); after more research use cases for this were found.
Related test case added

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7889 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-25 05:54:31 +00:00
mark_story
cfa2229689 Fixing incorrect implementation of RssHelper::channel(). Test cases added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7887 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-24 23:10:29 +00:00
mariano.iglesias
04d06bccf8 Adding tests for PaginatorHelper::prev(), disproves and closes #5793
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7884 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-23 16:38:35 +00:00
mark_story
f3fc8dd742 Fixing RssHelper test. Timezone in tests did not reflect the DST change.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7877 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-16 05:06:36 +00:00
mariano.iglesias
e9953e3f93 Fixing issue where JavascriptHelper::link was generating wrong URLs when webroot is defined and appending timestapping. Fixing issue in previous commit. Fixes #5723, fixes #5045
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7851 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 12:45:00 +00:00
mariano.iglesias
81e2f4a044 Fixing commit in r7843 so real files are accounted for
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7850 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 12:34:51 +00:00
renan.saddam
3223ba55cc Changing tests in order to works in both Linux and Windows.
Using correcly syntax of javascript->block.
Commenting no:cache test, it must be fixed in 1.2+.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7849 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 03:47:09 +00:00
renan.saddam
111b886570 Removed trailing whitespaces from tests.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7848 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:58:37 +00:00
mariano.iglesias
8777b8ef96 Fixing issue where double call to webroot on HtmlHelper::css was generating wrong URLs when forcing asset timestamp, fixes #5723
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7843 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 00:24:51 +00:00
mariano.iglesias
8da2a5208f Adding multibyte support to TextHelper::truncate, fixes #5610
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7842 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 00:07:17 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
mark_story
588f92ca31 Adding test for model saving with habtm.
Refactoring tests for ajax helper to use assertTags()

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7799 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 00:05:59 +00:00
nate
318c2b4952 Correcting SecurityComponent form hash generation when handling arrays, fixes #5588. Fixing code formatting in FormHelper test.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7794 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-29 06:55:42 +00:00
renan.saddam
41d82920f5 Fixing issue with rounded values in NumberHelper::toReadableSize. Fixes #5676.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7790 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-29 01:15:59 +00:00
mark_story
97cd2c5aef Committing patch from 'fernyb' to add support for with key in AjaxHelper::autoComplete()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7785 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-26 23:47:00 +00:00
mark_story
5a2db7a5b4 Fixing interaction between Model::_clearCache() and CacheHelper. Cached view files for camelCased controller or underscored URL's were not being cleared. Fixes #5611
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7783 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-26 18:51:38 +00:00
mark_story
2d1483e1e5 Updating formHelper::dateTime() to work correctly with string timestamp values. Closes #5621
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7781 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-26 14:53:06 +00:00
nate
16e2579f01 Correcting Security component to treat POST data arrays as a single field for validation purposes, fixes #5588
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7774 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 03:18:08 +00:00
mark_story
2350000be0 Adding tests for formHelper::select() to test secured fields generation. Refs #5588
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7765 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-20 03:01:01 +00:00
phpnut
f281f8814a Adding changes to tests to correct expected results when using hasAndBelongsToMany associations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7752 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-16 00:38:38 +00:00
mark_story
439116fd03 Adding test to paginator test. Disproves #5582
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7730 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-10 20:20:44 +00:00
mark_story
5c962accc1 Fixing timehelper::fromString when input time is invalid.
Tests added and renamed for better consistentancy with other tests.
Closes #5556

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7713 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-08 17:19:07 +00:00