mark_story
|
f21161ef46
|
Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
differences upon merging.
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/libs/cache/file.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/i18n.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/model/model_write.test.php
|
2010-09-24 23:27:22 -04:00 |
|
mark_story
|
8cd266c77f
|
Correcting example in doc block. Fixes #1132
|
2010-09-24 22:23:24 -04:00 |
|
mark_story
|
e4d34b640b
|
Merge branch '2.0-exceptions' into 2.0
Conflicts:
cake/libs/error.php
cake/tests/cases/libs/controller/scaffold.test.php
cake/tests/cases/libs/error.test.php
|
2010-09-10 20:31:16 -04:00 |
|
Mark Story
|
d88da3d579
|
Merge branch '1.3' into 2.0
Conflicts:
cake/libs/configure.php
cake/libs/model/connection_manager.php
cake/libs/model/model.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
cake/tests/cases/libs/view/helpers/text.test.php
|
2010-09-06 16:53:04 -04:00 |
|
Mark Story
|
c60edfae6d
|
Fixing issue where errors containing code = 500, were not actually converted to error500 when debug = 0. Making missingConnection, and missingTable into error500 errors.
|
2010-09-06 16:46:41 -04:00 |
|
mark_story
|
f1164c93d6
|
Updating the various CakeExceptions to take arrays in their constructors. This allows for the existing templates to continue working, as well as generalize the way in which errors are handled. This change also makes the messages coming out of exceptions more readable and removes string hackery.
|
2010-08-29 21:37:25 -04:00 |
|
mark_story
|
dc67b9cacc
|
Moving all the exceptions into one file for the short term.
|
2010-08-28 00:08:35 -04:00 |
|
mark_story
|
0683dc43ff
|
Replacing cakeError calls with exceptions in ConnectionManager and Model.
|
2010-08-27 23:54:22 -04:00 |
|
mark_story
|
b02e213958
|
Adding test case from '0x20h'. Fixing issue where atomic = false, validate = first and saveAll() saving many rows could return an incorrect value. Fixes #1050
|
2010-08-26 22:21:39 -04:00 |
|
mark_story
|
5446a062ee
|
Fixing issue where whitelist would not be used for validation. Test case added. Fixes #1037
|
2010-08-21 22:48:59 -04:00 |
|
mark_story
|
f46241a6e7
|
Merge branch '2.0' into 2.0-helpers
|
2010-08-16 23:02:44 -04:00 |
|
mark_story
|
705e90bef7
|
Merge branch '1.3' into 2.0-merge
Conflicts:
cake/libs/cache/memcache.php
cake/libs/cake_session.php
cake/libs/model/behaviors/acl.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/model/behaviors/acl.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
|
2010-08-15 23:09:02 -04:00 |
|
mark_story
|
b2250852e4
|
Moving BehaviorCollection into its own file.
Changing how behaviors are stored in the collection object. Makes it work the same as HelperCollection.
|
2010-08-10 23:18:39 -04:00 |
|
mark_story
|
d81d33ffe6
|
Adding some additional documentation for Model::find(). Fixes #952
|
2010-07-27 21:25:31 -04:00 |
|
mark_story
|
d38857095a
|
Merge branch '1.3' into 2.0
Conflicts:
cake/libs/model/model.php
cake/libs/validation.php
cake/libs/view/helpers/ajax.php
cake/tests/cases/libs/controller/components/session.test.php
|
2010-07-24 22:34:42 -04:00 |
|
Scott Reeves
|
b717abe1aa
|
Fixing typo in Constructor description.
Signed-off-by: mark_story <mark@mark-story.com>
|
2010-07-19 23:15:00 -04:00 |
|
José Lorenzo Rodríguez Urdaneta
|
bc27d1eae4
|
Returning only booleans in Model::__isset() and removing return by reference in Model::getDataSource()
|
2010-07-15 23:17:13 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
b8b4647355
|
Removing use of cakeError in Model and replacing it with an Exception
|
2010-07-15 23:11:30 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
6fb930c73b
|
Removing assignments by reference in model class
|
2010-07-15 22:16:19 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
a57e5e8c68
|
Replacing direct reads to schema cache and routing them to the correct method
|
2010-07-15 21:19:23 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
5d1e6f9e4f
|
Fixing errors with displayField
|
2010-07-15 21:18:16 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
a13be623b5
|
Making the model require database connection only wen needed or requested
|
2010-07-15 21:16:52 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
e165f7d559
|
Changing how dynamic "with" models are loaded
Changing all calls to get model's datasourse to use Model::getDatasource()
|
2010-07-14 23:19:38 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
c1a9a2e263
|
Correctly registering plugin models in CR, initial test case onmodel associations lazy loading
|
2010-07-14 19:23:41 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
96f834a7ea
|
Various bugfixes in model associations lazy loafing for "with" associations
|
2010-07-14 17:54:19 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
fdf91194a6
|
Initial approach for model associations lazy loading, all model tests passing
|
2010-07-14 16:58:12 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
91c3cd8905
|
Refactoring Model::__createLinks to not loose the plugin name when creating the association
|
2010-07-13 23:28:48 -04:30 |
|
mark_story
|
b8085cddce
|
Removing PHP5 and all its uses.
|
2010-07-05 22:19:22 -04:00 |
|
mark_story
|
4cd43553b4
|
Fixing issues where multiple reset bindModel() calls would cause incorrect associations to be restored.
Also fixing issues where multiple calls to unbindModel() would cause incorrect associations to be restored.
Tests added.
Fixes #889
|
2010-07-03 18:05:14 -04:00 |
|
mark_story
|
17a7a96ba2
|
Fixing issue where non-reset associations would get reset by resetAssociations if __backAssociations existed. Test cases from 'real34' added. Fixes #868
|
2010-07-01 12:39:50 -04:00 |
|
mark_story
|
cd8dff362d
|
Merge branch '2.0-phpunit' into 2.0
Conflicts:
cake/libs/controller/components/email.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/controller/components/email.test.php
|
2010-06-28 22:31:35 -04:00 |
|
mark_story
|
929bb5769e
|
Merge branch '1.3' into 2.0
Conflicts:
app/webroot/index.php
cake/console/templates/skel/webroot/index.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/controller/scaffold.php
cake/libs/model/datasources/dbo/dbo_oracle.php
cake/libs/model/model_behavior.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/acl.test.php
cake/tests/cases/libs/file.test.php
|
2010-06-26 12:29:20 -04:00 |
|
mark_story
|
ad8b70cec2
|
Removing continue statement that did nothing.
Adding a rollback for when validation fails and atomic has been set.
Tests added. Fixes #797
|
2010-06-09 13:48:54 -04:00 |
|
José Lorenzo Rodríguez
|
7d6ac7585a
|
Migrating ModelValidationTest to phpunit
|
2010-06-01 00:19:11 -04:30 |
|
predominant
|
6a18b2bc1d
|
Merge remote branch 'origin/1.3' into 2.0
Conflicts:
cake/basics.php
cake/console/libs/shell.php
cake/console/libs/tasks/controller.php
cake/libs/controller/components/request_handler.php
cake/libs/model/model.php
cake/libs/model/model_behavior.php
cake/libs/overloadable.php
cake/libs/overloadable_php4.php
cake/libs/overloadable_php5.php
cake/libs/sanitize.php
cake/libs/validation.php
cake/libs/view/helpers/ajax.php
cake/libs/view/helpers/javascript.php
cake/libs/view/pages/home.ctp
cake/tests/cases/console/libs/tasks/controller.test.php
cake/tests/cases/libs/overloadable.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/test_app/libs/cache/test_app_cache.php
cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
|
2010-05-20 12:22:04 +10:00 |
|
Mark Story
|
6add43a4bc
|
Fixing issue where id = null could cause SQL errors when saving more than one record with a null id. Fixes #675
|
2010-05-11 22:40:56 -04:00 |
|
predominant
|
8f880731c6
|
Removing closing PHP tags.
|
2010-05-11 08:27:28 +10:00 |
|
predominant
|
1ec220dac2
|
Removing closing PHP tags.
|
2010-05-11 08:07:49 +10:00 |
|
Mark Story
|
adf604a966
|
Merge branch '1.3' into 2.0
Conflicts:
cake/console/templates/default/actions/controller_actions.ctp
cake/console/templates/default/views/form.ctp
cake/console/templates/default/views/index.ctp
cake/console/templates/default/views/view.ctp
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/view/pages/home.ctp
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/model/cake_schema.test.php
|
2010-05-02 17:53:42 -04:00 |
|
Mark Story
|
257665eb5b
|
Updating doc blocks for bindModel and unbindModel, explaining that associations are only reset when find() is called. Refs #652
|
2010-05-01 17:37:23 -04:00 |
|
ADmad
|
46df1be384
|
Model::deleteAll() now returns false if the 'find' to fetch records ids returns false (in case of sql error). Closes #272
|
2010-04-25 02:34:18 +05:30 |
|
Mark Story
|
c9f103432c
|
Updating Model to use call_user_func_array instead of methods that were previously inherited from Object.
|
2010-04-23 20:47:40 -04:00 |
|
Mark Story
|
65ddc2b040
|
Fixing fatal errors caused by calling methods that no longer exist.
|
2010-04-23 20:45:13 -04:00 |
|
Mark Story
|
9046083dc8
|
Removing Overloadable and Overloadable2 they are not needed in PHP5.
Removing inheritance and test cases related to Overloadable.
|
2010-04-18 01:02:39 -04:00 |
|
predominant
|
92215e1795
|
Merge remote branch 'origin/1.3' into 2.0
Conflicts:
cake/libs/inflector.php
cake/libs/view/helpers/text.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/view/helpers/time.test.php
|
2010-04-16 23:43:28 +10:00 |
|
predominant
|
23a22c73b7
|
Remove "not being used" comment from Model docblock. Fixes #590
|
2010-04-16 21:45:44 +10:00 |
|
predominant
|
6bd9f0f05b
|
Convert models, datasources and file/folders to new version of translation shortcut function.
|
2010-04-16 02:00:25 +10:00 |
|
predominant
|
52cdef900b
|
Merge remote branch 'origin/1.3' into 2.0
Conflicts:
cake/dispatcher.php
cake/libs/model/behaviors/acl.php
cake/libs/model/behaviors/containable.php
cake/libs/model/behaviors/tree.php
cake/libs/router.php
cake/tests/cases/libs/validation.test.php
|
2010-04-09 22:05:00 +10:00 |
|
sdoney
|
9f601ea334
|
Adding/Updating @link tags pointing to cookbook sections
Signed-off-by: Mark Story <mark@mark-story.com>
|
2010-04-08 22:46:05 -04:00 |
|
predominant
|
5f2d091810
|
Cleanup some whitespace.
|
2010-04-05 16:43:47 +10:00 |
|