Commit graph

94 commits

Author SHA1 Message Date
phpnut
ca5f7d952c Merging fix when using Controller::persistModel = true and a requestAction method is used
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3911 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-22 20:33:21 +00:00
phpnut
b76c2179e1 Merged fixes from [3906]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3907 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-22 20:08:53 +00:00
phpnut
c773b64bfe Starting to refactor model loading
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3885 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-21 21:48:05 +00:00
phpnut
f95285d75f Starting to change all core code that uses $this->params
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3859 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-12 00:12:34 +00:00
nate
075891f1f9 Refactoring code and updating method references
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3841 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-08 03:28:24 +00:00
phpnut
9bc506b058 Merging fixes from 1.2.x.x into 1.1.x.x and vice versa.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3788 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 07:15:44 +00:00
phpnut
d7724fbfc4 Adding Controller::_selectedArray() to 1.1.x.x branch
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3779 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-31 19:35:47 +00:00
phpnut
6af7c6cca9 Added fix for #1317.
Method would return true on the first loop if persistModel was set to true.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3756 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-28 02:54:41 +00:00
phpnut
12a6df23ef Adding Controller::_selectedArray().
Changed Bake to use _selectedArray instead of _ _selectedArray()

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3742 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-26 03:08:53 +00:00
nate
2993a8d412 Adding Router path fixes for error pages (Ticket #1566), fixing code formatting (Dispatcher), and adding API enhancements for model behaviors
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3727 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-20 17:24:37 +00:00
phpnut
37329bb385 Reverting changes in [3706]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3707 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-18 12:55:19 +00:00
phpnut
e6e50dc936 Warning: Invalid argument supplied for foreach() in /project/cake/libs/controller/controller.php on line 724
Error would occur when the associated table did not contain any records

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3706 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-18 12:23:28 +00:00
nate
eea428e55d Code formatting and 1.2 interface updates
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3689 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-16 20:02:34 +00:00
nate
8319e0ff30 Adding extra URL parameters for pagination
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3594 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-29 01:30:09 +00:00
nate
cb29921144 Adding constructClasses() fix for using named URL arguments (Ticket #1400)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3593 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-29 00:15:13 +00:00
nate
6cf1447217 Refactoring controller paginatiion
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3585 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-28 20:29:04 +00:00
nate
daf235cd23 Adding fix for Ticket #1435
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3526 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-20 04:43:28 +00:00
phpnut
fc54b0f31a Adding fix for #1165.
Changing Model::__constructLinkedModel() to use the association name for 
the instance of an associated model.
Changed DboSource::read() to use the association name.


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3484 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 21:59:51 +00:00
nate
c42b793266 Minor update to Controller::postConditions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3459 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-10 17:08:53 +00:00
nate
fe3522c305 Adding Controller::disableCache() method, to send cache-disabling headers
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3441 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-29 19:09:35 +00:00
dho
fa38da38e5 Adding note to api doc of the redirect function (#1358)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3440 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-29 07:05:43 +00:00
nate
cfa4ed3516 Refactoring Controller::set() and removing Controller::_setArray()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3407 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-18 07:58:10 +00:00
nate
8fadeb3146 Fixing Controller::postConditions() to use $this->data if no parameters are passed
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3406 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-18 07:53:45 +00:00
nate
6a39b35df6 Adding additional data for pagination, and fixing docblock formatting
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3398 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-12 13:06:21 +00:00
nate
f7d7a2be73 Changing pagination key names
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3391 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-10 03:55:51 +00:00
nate
d78ef4d1fe Adding initial controller-side pagination implementation
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3387 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-08 17:33:57 +00:00
phpnut
e683b7090b Adding fix for #1168
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3317 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-29 17:52:12 +00:00
phpnut
ad32fd4cf2 Merging fixes from [3315]
Fixing errors when trying to use plugin components.
Added Controller::_initComponents();
Changed helpers and components to allow using plugins helpers or
components.
Syntax:
var $helpers = array('PluginName/HelperName');
var $components= array('PluginName/ComponentName'); 

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3316 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-29 17:28:13 +00:00
phpnut
566f1b60b9 Fixing errors when trying to use plugin components.
Added Controller::_initComponents();
Changed helpers and components to allow using plugins helpers or 
components.
Syntax:
var $helpers = array('PluginName/HelperName');
var $components= array('PluginName/ComponentName');


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3315 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-29 17:08:23 +00:00
nate
03fe0df49c Adding :-style named arguments
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3295 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-23 16:13:05 +00:00
phpnut
d8533c4d34 Fixing Notice: Undefined property: AppController::$webservices when debug messages are displayed
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3211 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-07 02:46:16 +00:00
nate
1cca718150 Adding customization parameters to Controller::postConditions(), for Ticket #585
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3127 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-17 14:10:01 +00:00
nate
0d707d4360 Adding ability to specify named arguments in the URL
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3115 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-15 15:51:34 +00:00
phpnut
eefd467da7 Adding fix for components not being available in PHP 4
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3102 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-15 09:58:45 +00:00
phpnut
9d19dee879 Renaming branched version directory
git-svn-id: https://svn.cakephp.org/repo/branches/1.1.x.x@3085 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-14 18:02:37 +00:00
phpnut
e5c074a0dc Merging fixes into 1.x.x.x branched code:
Revision: [2955]

Revision: [2951]

Revision: [2918]

Revision: [2911]

git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2958 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-26 05:29:17 +00:00
phpnut
5e268e0805 Merging fixes into 1.x.x.x branched code:
Revision: [2802]




git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2805 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-09 02:15:47 +00:00
phpnut
f5a4a58758 Renaming directory for 1.x.x.x code base
git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2771 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-07 03:35:58 +00:00
phpnut
0c0dec8bc0 Merging fixes into the trunk.
Revision: [2629]
Fixed recursive associations when set to 0, did not add the hasOne or belongsTo in the query.
Changed scaffold to use recursive setting of 0 in all methods that call Model::findAll()
Fixed Invalid argument supplied for foreach() notice in show.thtml
Removed 500 record limit in Controller::generateFieldNames()

Revision: [2628]
Merging changes from model_php5.php

Revision: [2627]
Fixing messed up characters in dbo_odbc, adding docstrings, and giving connect() a return value

Revision: [2625]
Bringing all DB drivers up to date

Revision: [2624]
Changed fixed for Ticket #609 so and empty array is set instead of null.
This is more consistent with the other arrays that are returned if an association is found

Revision: [2623]
Adding fix for Ticket #712

git-svn-id: https://svn.cakephp.org/repo/trunk/cake/1.x.x.x@2630 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-28 05:26:06 +00:00
phpnut
32f9e1e0e5 Merging fixes into trunk.
Revision: [2522]
renamed Bake class file

Revision: [2521]
removing old bake scripts

Revision: [2520]
Adding new Bake script

Revision: [2519]
Adding fix for Ticket #622

Revision: [2518]
Adding fix for Ticket #535

Revision: [2517]
Adding fix for Ticket #648, associated records are now post-processed by afterFind() method in associated model

Revision: [2516]
Adding fix for Ticket #618

Revision: [2515]
More error page fixes

Revision: [2514]
Adding fix for Ticket #690

Revision: [2513]
Removing empty method

Revision: [2512]
Adding fix for Ticket #675

Revision: [2511]
More fixes for Ticket #670

Revision: [2510]
Adding fix for Ticket #670, and removing pointless part of Helper::output(), since print() *always* returns 1.

Revision: [2509]
Adding fixes for Tickets #677 and #681

Revision: [2508]
Added patch from Ticket #632

Revision: [2502]
Adding fix to prevent model ID from getting overwritten when saving HABTM data [TEST ME] - thanks sdevore

Revision: [2501]
Rewriting foreach loops in queryAssociation()

Revision: [2493]
Adding fix for Ticket #673

Revision: [2492]
Adding reconnect() method, to reconnect to database with different settings

Revision: [2491]
Adding Microsoft SQL Server driver [EXPERIMENTAL]

Revision: [2490]
Fixing a bug that occurs when connecting to two different databases on the same server, and enabling cross-database model associations

Revision: [2488]
Adding fix for Ticket #651

Revision: [2487]
Adding fix for Ticket #665

Revision: [2486]
Adding fix for Ticket #655

Revision: [2485]
Forcing DboMysql to validate disconnect, and adding fix for Ticket #663

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2528 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-24 16:24:57 +00:00
phpnut
43e074acb0 Merging fixes and enhancements into trunk.
Revision: [2457]
Adding fix for Ticket #612

Revision: [2456]
"Enables use of Controller::$data in addition to Controller::$params['data']"

Revision: [2455]
"Adding fix for Ticket #634"

Revision: [2454]
"Removing trailing directory separator on ROOT"

Revision: [2451]
Dispatching and routing changes for IIS

Revision: [2450]
Downgrading error level in AclNode::create and adding additional filename check in listClasses()


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2462 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-06 00:06:02 +00:00
phpnut
c899c085f5 Merging fixes and enhancements into trunk.
Revision: [2448]
removing tabs in last commit

Revision: [2447]
Adding fix for limit in all associations

Revision: [2446]
Added fix for Ticket #569

Revision: [2443]
Adding fix for Ticket #592.

Revision: [2437]
Adding fix for Model::findNeighbours().
Was returning all associations and fields. Now recursive is set to 0 and only returns the prev and next keys array

Example $this->Category->findNeighbours(null, 'Category.id', 4);

Will return,

Array
(
    [prev] => Array
        (
            [Category] => Array
                (
                    [id] => 3
                )

        )

    [next] => Array
        (
            [Category] => Array
                (
                    [id] => 5
                )

        )

)

Revision: [2432]
Removed the DS constant from the plugin var when it is set in Dispatcher.
Added "$this->plugin.DS." constant in files where needed after change above.
Added fix for Ticket #577.

Revision: [2428]
Added fix for HtmlHelper::checkbox() it ignored the value provided as a parameter
Fix for Ticket #605.
Fix for Ticket #607.


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2449 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-28 19:46:59 +00:00
phpnut
87d703eaa5 Merging fixes and enhancements into trunk.
Revision: [2426]
Added patch from Ticket #566.

Revision: [2425]
Adding patch from Ticket #603.

Revision: [2424]
Adding fix for Ticket #604

Revision: [2423]
Adding fix for Ticket #601

Revision: [2422]
Refactoring ACL and updating queries

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2427 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-28 02:44:55 +00:00
phpnut
c141859d3a Merging fixes and enhancements into trunk.
Revision: [2420]
Added fix for Ticket #320.
Fixed Model::save() so it will only allow a model to save itself.
Fixed Model::save() when saving a HABTM association

Revision: [2419]
Added fix for Ticket #463

Revision: [2418]
Added patch from Ticket #598

Revision: [2417]
Added fix for Ticket #581

Revision: [2416]
Adding fix for Ticket #579

Revision: [2415]
Adding patch from Ticket #597

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2421 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-26 19:15:30 +00:00
phpnut
427f439f38 removed extra $ in last commit
git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2409 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-26 10:03:06 +00:00
phpnut
d595e46055 Merging fixes and enhancements into trunk.
Revision: [2406]
Adding model persistence when using var $uses array.
Added var $name to PagesController

Revision: [2405]
Adding 5 of the 7 patches from Ticket #594

Revision: [2404]
Added fix for Ticket #575

Revision: [2403]
"Adding fix for core vendors directory when cake installation is separated into different paths "

Revision: [2402]
Added fix for Ticket #588

Revision: [2397]
Adding fix for Ticket #580

Revision: [2387]
Adding fix for Ticket #558

Revision: [2386]
Adding fix for Ticket #562

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2407 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-26 09:59:40 +00:00
phpnut
23d183e46b Merging fixes and enhancements into trunk.
Revision: [2369]
Added missing doc comments to classes

Revision: [2368]
Removing core view paths from Configure class

Revision: [2367]
Updating View class to use new Configure class to search paths for view files

Revision:[ 2366]
Corrected loadControllers() in basics.php

Revision: [2365]
Updating function in basics.php to use new Configure class

Revision: [2364]
removed duplicate loading of app/config/bootstrap.php

Revision: [2363]
Added new Configure class to hold paths to models, views, and controllers related to Ticket #470.
Moved loading of app/config/bootstrap.php to Configure class from app/webroot/index.php.
Added creating instance of Configure instance in cake/bootstrap.php
Added example of setting custom paths in app/config/bootstrap.php 
Corrected error in Object::_savePersistent().

Revision: [2362]
Added fix for Ticket #534

Revision: [2361]
Refactoring persistent code a little more.
File now holds a variable with the serialized class and is include vs. reading file contents.

Revision: [2360]
Refactored persistent methods to use cache()

Revision: [2359]
Fixing array_combine() Warning in  Model::generateList()

Revision: [2358]
Set var $persistModel to false by default

Revision: [2357]
Moved persistent code to Object class.
Moved $TIME_START variable to top of file.
added __sleep methods for models

Revision: [2356]
Reverting persistent changes to Model class

Revision: [2355]
Adding fix for Ticket #550

Revision: [2354]
Corrected errors in persistent code

Revision: [2353]
Corrected overwrite in the model/model_php4.php file.

Revision: [2352]
Adding persistent methods to Model class.
This will allow caching of classes.
Added app/tmp/persistent directory.

Revision: [2351]
Reverting changes to dbo_source.php in [2350]

Revision: [2350]
Removed name pattern matches related to Ticket #534

Revision: [2349]
Adding fix for Ticket #548

Revision: [2348]
Adding fixes from Ticket #547.

Revision: [2347]
Adding fixes from Ticket #546.

Revision: [2346]
Adding fix for Ticket #527

Revision: [2345]
Refactored Html::url()

Revision: [2344]
Last fix for Ticket #483 

Revision: [2343]
Updating last commit

Revision: [2342]
Adding fix for Ticket #483

Revision: [2341]
Adding fix for Ticket #543, DBO will now only cache SELECT queries

Revision: [2340]
Adding session_write_close() to the CakeSession::__regenerateId()

Revision: [2339]
Adding patch from Ticket #544

Revision: [2338]
Adding patch from Ticket #529

Revision: [2337]
Adding patch from Ticket #528

Revision: [2336]
Removing the converting of \n to <br /> in Sanitize::html()

Revision: [2335]
Added bash script from Ticket #533

Revision: [2334]
Added enhancement for Ticket #474

Revision: [2333]
Correcting errors introduced with prior fix

Revision: [2332]
Correcting errors introduced with prior fix

Revision: [2331]
Performance optimization for NeatArray::findIn(): replaced foreach loop with for

Revision: [2330]
Minor performance optimization: Replacing all occurrences of low() with strtolower()


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2370 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-19 03:26:43 +00:00
phpnut
fb46bcceef Merging fixes and enhancements into trunk.
Revision: [2316]
Added fix for message:  Warning: array_diff(): Argument #2 is not an array in Controller::__construct()

Revision: [2315]
Adding fix for Ticket #517

Revision: [2314]
Corrected scaffold throwing errors when irregular words are used for model/table names

Revision: [2313]
Added patch from Ticket #495.
Added missing ?> bracket at end of file

Revision: [2312]
Corrected model names being set to lower case, When matched to an irregular word in Inflector methods.
Added custom inflections.php file to allow application to have custom inflection rules.
Correct variable in View::renderCache(). error thrown if time class was used $time variable changed to $timeStart.

Revision: [2311]
Corrected $db placed in wrong section of the method

Revision: [2310]
Removing the db attribute from the model, This will help better with persistent objects

Revision: [2309]
Adding fix for Ticket #490

Revision: [2308]
Update to previous commit

Revision: [2307]
Removing references to Model->db. DataBase connections are now singleton-only.

Revision: [2306]
Refactoring getDataSource() into loadDataSource() and enumConnectionObjects()

Revision: [2305]
Reverting changes to this file

Revision: [2304]
Fixing Ticket #496, getColumnType, and docstrings

Revision: [2303]
Adding fix for Ticket #510


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2317 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-15 20:45:59 +00:00
phpnut
9f9c84de52 Merging fixes and enhancements into trunk Added fix for Ticket #492.
Revision: [2299]
Added fix for Ticket #494.
Added fix for Ticket #489.

Revision: [2298]
Fixed regex that would match more than one <cake:nocache></cake:nocache> group and cause a  wrong replace of the tags

Revision: [2297]
Corrected error in the convertSlash() function

Revision: [2296]
Another bug found and corrected after last commit.
This is working as expected now, and will be refactored.

Revision: [2295]
Fixed undefined index in CacheHelper::__parseFile();
Fixed caching when method is cached without params being set in the key

Revision: [2294]
Corrected caching for index method when accessing www.example.com/controller this would not use default index method.
Removed auto setting of the data variable in Controller::render();
Added additional check for cached index view in bootstrap.php

Revision: [2293]
Refactoring caching code.
Fixed problem with files being cached for all methods.
Added code to cache files to create helpers. 
Moved duplicate code to basics.php as a function

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2300 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-14 11:54:03 +00:00
phpnut
fc0854e397 Merging fixes and enhancements into trunk.
Revision: [2287]
Merging changes from model_php4.php

Revision: [2286]
Added serialized object data to the cached file.
Instances of the view helpers are available in the views now.
You also have access to the Controller::<component>, example $this->controller->Session;

Revision: [2285]
Adding Controller::postConditions() to convert a POST'ed data array to a Model conditions array

Revision: [2284]
Adding Model::invalidate() and refactoring Model::invalidFields().  Adding a fix for RequestHandler::accepts()

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2288 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-14 02:26:08 +00:00