Commit graph

79 commits

Author SHA1 Message Date
phpnut
0ab73bb5fa "Adding a second param to bindModel and unbindModel to allow
turning off the auto resetting of the associations.
By default associations are always reset to the orignal models values"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4222 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-28 04:02:38 +00:00
phpnut
a4ca03ed69 Fixing magic method names
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4211 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-26 16:17:37 +00:00
nate
0cea0a6ff5 Integrating new Validation class with Model
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4193 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-25 06:53:19 +00:00
nate
a420c70c91 Optimizing findCount() query, and adding beforeFind() reference fix for Ticket #1693
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4165 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-23 20:36:00 +00:00
nate
19798c71b3 Adding 1.2 fix for Ticket #1797
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4132 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-23 00:17:52 +00:00
nate
982381dc74 Binding additional Behavior callbacks to Model
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4108 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-19 19:26:02 +00:00
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