Commit graph

3229 commits

Author SHA1 Message Date
phpnut
1aa2324e8e "Fixes #3786, Missing keys when Model merges actsAs.
Added additional test for Set::merge();
Refactored Controller::_mergeVars."

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6292 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-01 01:07:24 +00:00
phpnut
013133457c "Fixes #3768, Controller loads wrong model when plugins controller has the controller name of a main model.
moved merging of components, helpers, and uses vars to Controller::_mergeVars(); fixes bug with PluginAppController vars not being merged before components are loaded.
  Added call to Controller::_mergeVars(); in Dispatcher::dispatch();"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6291 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-31 23:27:14 +00:00
nate
6a2a24cfc9 Updating help text for ACL shell interface, fixes #3790
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6290 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-31 22:30:46 +00:00
gwoo
cedaddbc08 updating controller task with i18n wrappers, closes #3490
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6289 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-31 22:27:53 +00:00
nate
ac1c7e9da8 Adding stored procedure support to DboMysqli, fixes #2348
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6288 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-31 18:12:44 +00:00
nate
368b085c94 Adding asset filters for CSS and JS, set using 'Asset.filter.css' and 'Asset.filter.js', fixes #2233
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6287 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-31 05:19:00 +00:00
nate
18110fe97a Adding asset timestamps for JS, CSS, and images. Set 'Asset.timestamp' to true in Configure (only in dev mode), fixes #921
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6286 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-31 04:24:14 +00:00
gwoo
b57ee695a4 updating TimeHelper, closes #1182
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6285 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-31 01:45:57 +00:00
nate
1c9b87da4e Fixing environment detection issues in Dispatcher, adding environment tests, adding tests for embedded route regular expressions, fixes #2666
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6284 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-30 22:33:48 +00:00
nate
a11db494bb Changing SERVER_IIS constant to 'App.server' config variable
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6283 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-30 22:28:59 +00:00
gwoo
f6b71c29e9 updating HtmlHelper, closes #2592, closes #2406, closes #2220, closes #2080, tests added
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6282 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-30 21:14:15 +00:00
gwoo
48bf9e420d updating router admin handling, closes #3697 test added
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6281 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-30 19:53:21 +00:00
gwoo
fdeb41a826 updating FormHelper::inputs(), fixes #3770, tests updated
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6280 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-30 18:25:00 +00:00
gwoo
a1198bb3b7 reverting previous changes and updating view, fixes #3785
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6279 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-29 21:20:48 +00:00
gwoo
3b1b182873 updating view again
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6278 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-29 21:10:41 +00:00
gwoo
aa637e1b1d updating view, fixes #3785
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6277 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-29 21:03:36 +00:00
gwoo
040f9cca8b updating plugin task, fixes #3781
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6276 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-29 20:53:58 +00:00
gwoo
1b10036712 updating model task, fixes #3782
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6275 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-29 20:48:00 +00:00
gwoo
7e845242d5 updating set handling of xml and adding tests for model saving xml
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6274 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-29 20:24:10 +00:00
gwoo
9a8bd5680a updating debugger test
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6273 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-29 19:05:41 +00:00
gwoo
99da081907 updating dispatcher, fixes #3773, fixes #3783, fixes #3779, updating default layouts, adding Debugger::dump($var); and some other changes for exporting string vars
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6272 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-29 19:05:22 +00:00
nate
d38bb91d1c Updating component tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6271 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-29 16:35:38 +00:00
nate
658b98e361 Adding empty table handling in TreeBehavior::generateTreeList(), fixes #3784
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6270 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-29 16:20:30 +00:00
nate
31138695ed Whitespace fixes in webroot/index
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6269 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-29 03:30:46 +00:00
phpnut
ebe356d3b1 "Fixes #3772, getting errors using treebehavior and translatebehavior on the same model"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6268 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-27 08:33:29 +00:00
phpnut
c5ff7cb4db "Fixes #3774, Set::combine possibly applies wrong formatstring"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6266 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-27 07:59:22 +00:00
gwoo
4f97057a62 fix for DbConfig task caused when plugin support was added to bake
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6265 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-27 07:41:56 +00:00
phpnut
c727b14365 "Correcting SetTest::testMapReverse() with recent changes to model vars"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6264 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-27 06:49:07 +00:00
nate
e48e6a5e83 Fixing column lengths in DboMssql::describe(), fixes #3769
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6263 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-26 22:44:41 +00:00
phpnut
63bb042c9e "Fixes #3766, RequestAction fails on plugin to app and plugin to plugin"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6262 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-26 02:20:47 +00:00
phpnut
394ee0c8fc "Removing debug()"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6260 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 11:15:52 +00:00
phpnut
0644112ca9 "Closes #3560, edit form use PUT so SecurityComponent::validatePost() don't call on submit"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6259 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 10:49:29 +00:00
nate
72c80efa75 Fixes #3698, no additional select performed in Model::deleteAll() if $callbacks and $cascade are false
Fixes #2146, set 'foreignKey' => false and use association conditions to get custom join scoping
Fixes #3323, set 'foreignKey' => false to disable default conditions
Fixes #3627, added Model::$findQueryType to inform callbacks of the current find query type, i.e. 'count'


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6258 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 10:37:08 +00:00
phpnut
75b5623f33 "Closes #3587, Multiple resource routes"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6257 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 10:25:42 +00:00
phpnut
9bed2fa6d7 "Fixes #3255, Adding link attributes to breadcrumb links in Html helper"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6256 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 10:07:27 +00:00
phpnut
6fe54aa1d0 "Reverting 5254, this change is only for 1.2 branch"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6255 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 09:55:59 +00:00
phpnut
f9c1058a20 "Closes #3295, Centralize encoding / charset setting in one Configure setting"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6253 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 09:08:36 +00:00
nate
fbf5330fd8 Adding TreeBehavior::setScope(), fixes #3232
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6252 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 09:00:05 +00:00
phpnut
69b2ad7556 "Closes #3338, Allow AuthComponent::allow to take an array as an argument"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6251 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 08:11:26 +00:00
phpnut
9c6f44006f "Closes #3012"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6249 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 07:59:13 +00:00
phpnut
b96a3a2e6f "Closes #3216, Allow condition overrides in AuthComponent::identify()"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6248 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 07:33:29 +00:00
phpnut
aa667c4d61 "Closes #3059, Set::format() allow arg type conversion with use of sprintf format style"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6247 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 07:10:20 +00:00
phpnut
23ad8a4c7d "Closes #3651, Allow the specification of an interval in the generation of the minute select"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6246 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 06:45:48 +00:00
nate
4d68d6c6dd Adding fixtures for 'with' association tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6245 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 05:35:37 +00:00
phpnut
1489239252 "Closes #2215, Santize Class and EmailComponent need some header injection protection and cleaning"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6244 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 05:30:54 +00:00
phpnut
3935746a29 "Refactored Model::invalidFields() to pass array(field => value) back to custom validation methods in a model
Closes #1863 postal code validation for Italy and Germany
Closes #2766, Add field name to params array for custom validation rules
Closes #3735, Custom validation functions
Commented out the failing model tests until the missing fixtures are added
"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6243 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 04:53:15 +00:00
gwoo
d7926aaaad adding context and trace to other debugger output formats. adds E_USER_ERROR to fatal
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6242 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-24 23:47:46 +00:00
phpnut
71039959d0 "Refacorting App::import() to implement vendors loading.
Added ability to set the file extension of the file to be loaded"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6241 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-24 22:39:28 +00:00
nate
586e93f59f Adding 'last' validator option fix for Model::invalidFields()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6240 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-24 22:14:31 +00:00
gwoo
44718cced7 fixing datetime handling dbo_mssql, fixes #1778
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6239 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-24 02:49:13 +00:00