Commit graph

73 commits

Author SHA1 Message Date
nate
b5face3516 Changing Model::del to check for existence of itself before allowing deletes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4099 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-13 04:04:15 +00:00
nate
37281be9de Checking if model exists when setting 'created' field, to enable use with custom IDs
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4094 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-12 22:06:22 +00:00
dho
cc9b30ad2f Typo (ticket #1738)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4088 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-08 17:37:54 +00:00
gwoo
ecb2b8c786 fix for generateList
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4065 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-04 06:59:56 +00:00
phpnut
e935b51b8d Adding fix for Ticket #1699
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3991 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-27 05:57:53 +00:00
phpnut
fd65f226e6 Adding fix for Ticket #1626.
This fixes deleting of associated hasOne and hasMany when using bindModel before Model::delete()

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3941 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-23 11:31:59 +00:00
phpnut
2e0ec28018 Fix for Ticket #1689.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3940 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-23 11:05:47 +00:00
phpnut
87af38c7dc Merging fixes from [3908] for Ticket #1689
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3909 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-22 20:25:13 +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
883ecc1cd0 Merged fix for Ticket #1675
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3903 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-22 19:36:59 +00:00
nate
099144bcbd Changing Set interface to act like NeatArray, disabling Model::cacheQueries by default, and removing NeatArray usage in Model
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3888 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-21 22:40:30 +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
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
b42373467f Adding fix for scaffold when using an alias association, mostly found on self joined models, or models that have multiple associations to the same model
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3820 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 21:01:24 +00:00
gwoo
8fef7cf4ba 1.2: fix for groupPath recursive in generateList
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3819 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 19:49:32 +00:00
nate
50da950aba Fixing Model::findCount() for ADODB (Ticket #1613)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3802 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-02 14:44:44 +00:00
phpnut
dedb404423 Merging fixes for associations to 1.1.x.x branch
Removed commented code from Model::_ _generateAssociation() in 1.2.x.x

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3796 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 20:31:45 +00:00
nate
add6e512e7 Adding Model::__wakeup() (Ticket #1582)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3754 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-28 00:42:51 +00:00
nate
0bab7de4d6 Updating docblock for Model::create
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3753 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-27 22:35:40 +00:00
nate
d22e84af09 Fixing code formatting
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3752 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-27 21:42:29 +00:00
nate
45f27cda1c Refactoring Model
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3748 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-27 18:14:35 +00:00
nate
2046eed40d Refactoring DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3740 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-25 13:27:32 +00:00
gwoo
42676402d3 fix for #1572, $this->id set to lastInsertId after save
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3739 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-25 12:07:16 +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
gwoo
d485edd1ab adding fix for generate list to 1.2
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3703 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-18 01:07:09 +00:00
nate
3a03674c76 Moving DataSource::getFieldValue to Set::extract
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3667 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-14 17:19:03 +00:00
nate
d66ca81671 Adding validation logic fix (Ticket #1518)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3628 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-10 22:29:13 +00:00
nate
d412939912 Refactoring Model::save and teaching Model to eat XML
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3620 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-09 22:00:22 +00:00
gwoo
46d9b86b76 adding fix for #1465 and #1469
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3581 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-28 16:44:02 +00:00
nate
68e046e3a2 Adding 1.2 branch fix for Ticket #1357
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3515 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-19 02:50:53 +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
phpnut
f08a4d7fa2 Removing empty lines
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3480 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 18:50:33 +00:00
phpnut
fec633f227 Corrected bad merge on model.php
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3479 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 18:42:51 +00:00
phpnut
678ec860a1 Adding fix from #1215
Fixes issues with saving HABTM

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3478 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 18:37:51 +00:00
nate
198dab8a46 Filtering out empty magic fields when saving models
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3463 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-11 00:35:06 +00:00
nate
554b4ceb42 Fixing DataSource calls for PHP4
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3429 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-25 00:43:48 +00:00
nate
be1737114c Adding $primary parameter to Model::afterFind() (and Behavior::afterFind())
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3408 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-18 08:00:54 +00:00
nate
7971fc0de6 Refactoring model SQL and DataSource references
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3404 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-17 11:44:29 +00:00
nate
951e257fa2 Removing model references to phpversion()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3377 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-06 23:21:36 +00:00
phpnut
36ae60d0e7 Making changes to Security class
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3353 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-03 06:49:51 +00:00
nate
a75f33f430 Adding optgroup support for 2D arrays in FormHelper::select(); adding grouping ability to Model::generateList()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3326 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-30 23:31:04 +00:00
nate
ab419f3fe1 Resolving minor Model implementation differences between PHP4 and 5
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3325 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-30 16:49:40 +00:00
nate
796222dfeb Abstracting PHP4/5 overload implementation to custom base class
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3324 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-30 12:24:03 +00:00
nate
07ec77ef22 Adding model behaviors, model onError callback, and updating FormHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3280 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-22 14:13:07 +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
9a8d5c15fe Merging fixes and enhancements into trunk
Revision: [2009]
Adding fixes for session errors posted in the google group.
Changed the header for PHP version in the model classes.
Change uses() back to require_once 

Revision: [2008]
Adding reference back to the PHP 4 model

Revision: [2007]
Merging changes from model_php5

Revision: [2006]
Fixing recursive associations, adding whitelist to Model::save

Revision: [2005]
Added fix for error in CakeSession class.
Updated home.thtml

Revision: [2004]
Rearranged  some of the defines moving the most often changed ones to the top of the script

Revision: [2003]
Moved SQL files distributed with the core to app/config/sql/
Removed app/config/routes.php.default
Fixed class_exists check in TextHelper

Revision: [2002]
adding sql directory

Revision: [2001]
Fixed error when cake distribution is installed inside of the DOCUMENT ROOT 

Revision: [2000]
Adding checks for classes that are already loaded so the require() calls will not error

Revision: [1999]
Replacing all require_once() with require()

Revision: [1998]
Moved creation of the Dispatcher object to app/webroot/index.php

Revision: [1997]
Adding session sql file

Revision: [1996]
Revision: [1995]
Fixing session db queries

Revision: [1994]
Change the require_once in bootstrap to require.
Merged changes John made to the CakeSession database methods

Revision: [1993]
Removing some constants that are not needed

Revision: [1992]
Adding fix for Ticket #400

Revision: [1991]
Fixing Ticket #348

Revision: [1990]
Fixing Tickets #397 and #399

Revision: [1989]
Fixed callbacks in JavaScript events and Ajax, fixed Controller::beforeRender so you can set view variables, and fixed Ticket #394

Revision: [1988]
Renamed the $dir param to $direction.
Added default value to the DboSource::order() $direction param.

Revision: [1987]
Adding changes back to the sessions class I reverted in [1984]

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2010 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-17 10:12:15 +00:00
phpnut
73830ec0dc Merging fixes and enhancements into trunk
Revision: [1841]
Merging changes made in model_php5.php to model_php4.php

Revision: [1840]
Adding fix for PHP 5 when using mysql_connect setting.
Commented out the call to Dbo*::disconnect(). This was closing connections early.
Adding fixe for Ticket #302.
Adding Enhancement for Ticket #300.
Adding fix for Ticket #299
Adding Enhancement for Ticket #298
Adding fix for Ticket #297
Adding Enhancement/Patch from Ticket #296

Revision: [1838]
working on deeper recursive joins

Revision: [1837]
Updating copyright information in all files

Revision: [1836]
Adding fix when setting a field value to 0.
Before it would set this to NULL, which was not expected result.  


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1842 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-20 07:46:14 +00:00
phpnut
ee6ccf15b6 Merging fixes to trunk
Revision: [1819]
Added fix for undefined index in Form::generateFields()
Adding missing doc blocks.
Adding fix for Ticket #290.
Added fix to allow setting fields for models.

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1820 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-17 17:52:23 +00:00
phpnut
677a39a445 Merging changes to trunk:
Revision: [1761]
Removing old db_acl.sql

Revision: [1759]
Removed unneeded calls to uses().
Changed basics.php listClasses() no longer using folder class.
Starting corrections in  DboPostgres class.
Adding missing DboPostgres::query().
Added missing doc blocks to AjaxHelper.
Fixed undefined keys in FormHelper::generateFields()
Reformatted FormHelper::generateFields() adding open and close brackets where needed

Revision: [1758]
Fixed typo

Revision: [1757]
Fixed errors found when using PHP 4.
Fixed a scaffold error

Revision: [1756]
Merging changes to model_php4.php

Revision: [1755]
Fixed scaffolding for the changes made to the model.
Fixed Model::isForeignKey(), replaced array_key_exists with in_array, other function was failing

Revision: [1754]
Committing changes from bundt model to beta.
DataSources will not be in the beta release

Revision: [1751]
Cleaning up a little more in the code.
Removing loading of log.php unless it is really needed.
Refactored dispatcher to speed up the stripslashes code if it is called

Revision: [1748]
removing all references to error_messages and deleting the file

Revision: [1747]
updated more error messages

Revision: [1746]
removing all error message defines

Revision: [1745]
added _() method from 1.0 to basics.php only used to return string right now

Revision: [1744]
Adding fix for ticket #220

Revision: [1743]
More work on ErrorHandler class

Revision: [1742]
Renaming error view for missing database connection

Revision: [1741]
More work on ErrorHandler class

Revision: [1740]
More work on error class

Revision: [1739]
Replacing all $_SERVER variable check with env() in basics.php

Revision: [1738]
Adding env() to basic

Revision: [1737]
Updated session to use env()

Revision: [1736]
Removing ternary operators from Dispatcher

Revision: [1735]
Per nates request I am rolling back ACL to [1373]

Revision: [1734]
Removed the IP in the session class this was not very reliable.
Added a time setting that generates current time adding the Security::inactiveMins() to the session
Removed code that was added to basics.php to replace gethostbyaddr().
Added CAKE_SESSION_STRING define to core.php which is used in the by the Session class to generate a hashed key.

Revision: [1733]
Moving errors messages to ErrorHandler class.
Updating errors view for use with new class.
Updating Scaffold to use new class.
Updated Dispatcher to use new class.
Removing methods from Object class

Revision: [1732]
Adding ErrorHandler class

Revision: [1731]
Adding fix for Ticket #223


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1762 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-12 02:10:47 +00:00
phpnut
5193402736 Merged
Revision: [1696]
Adding fix to allow NULL values to be passed as a string or NULL setting the SQL to NULL or "NULL".




git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1697 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-01 05:04:23 +00:00