Commit graph

17 commits

Author SHA1 Message Date
phpnut
6d71310f00 Beginning to port fixes to 1.2.x.x code from 1.1.x.x
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3268 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-15 03:36:53 +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
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
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
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
f37dfb6302 Merging fixes and enhancements into trunk.
Revision: [2133]
Fixing sub package doc tag

Revision: [2132]
Added fixes when ini_set() is disabled.                   
Problem reported here:
    http://groups.google.com/group/cake-php/browse_thread/thread/f8e537b165da733e/06888a4112345f59

Revision: [2131]
"Correcting subpackage doc block tags "

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2134 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-25 19:20:18 +00:00
phpnut
e45d19e199 Merging fixes and enhancements into trunk.
Revision: [2104]
Correct changes of names in scaffold.

Revision: [2103]
Changed methods to protected methods
Controller::_beforeScaffold($method)
Controller::_scaffoldError($method)

Revision: [2102]
Added 2 methods to Controller class that must be overridden in child classes if you place to use Scaffold in production applications.
This will allow you to perform checks before displaying the forms, and also before performing any Scaffold methods.

Each of these methods are passed the name of the method they represent in Scaffold.
Controller::beforeScaffold($method)
Controller::scaffoldError($method)

These 3 name are passed to the methods above, but are not view related 
'create' when creating a new record in the database
'update' when updating a record in the database.
'delete' name says what it does

These are view related names passed to the methods above
'index' the list of all records shown in scaffold.
'edit' the edit record form.
'show' when displaying a specific record.
'add' add record form.


Scaffold can now be used to generate forms and customize these on a per app or per controller basis.
Scaffold will first look:
Example: app/views/posts/
Then: app/views/scaffold/

There are also specific naming used for these views each related to a scaffold method.

scaffold.list.thtml
scaffold.edit.thtml
scaffold.new.thtml
scaffold.show.thtml

Added scaffold_error.thtml that is used if a controller does not implement Controller::scaffoldError() when using scaffold and Controller::beforeScaffold() is implemented and returns false

Revision: [2101]
Corrected some bugs found in View that would cause errors when using scaffold.

Revision: [2100]
Added fix for Ticket #427 

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2105 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-23 11:40:52 +00:00
phpnut
a75e08976f Merging fixes and enhancements into trunk
Revision: [2025]
A little more work on plugin to set some default routing.

Revision: [2024]
Changed DboSource::field() so the name() is not called for some field variables.

Revision: [2023]
Changes made in [2022] should only check if the $conditions is not empty.

Revision: [2022]
Changed DboSource::conditions() so it will add the "ticks" needed around the Model.field names.
The Model.field name conventions must be used for this to work.

Revision: [2021]
Adding fix for Ticket #405

Revision: [2020]
Added fix for Ticket #403

Revision: [2019]
Added patch from Ticket #404.
Fixing formatting of files.

Revision: [2018]
Fixing formatting of files 

Revision: [2017]
Fixed bad search and replace

Revision: [2016]
Fixing formatting of files 

Revision: [2015]
Replaced all 3 space indents with 4 space indents

Revision: [2014]
Updating variables to use the naming proper conventions

Revision: [2013]
Added patch from Ticket #406

Revision: [2012]
Adding fix for Ticket #407.
Fix variables that where not formatted per the coding conventions

Revision: [2011]
Adding patch from Ticket #401

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2026 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-18 23:42:21 +00:00
phpnut
b4f6dcc474 Merging fixes and enhancements into trunk
Revision: [1862]
Cleaning up scaffold views

Revision: [1861]
Added fix to scaffold when setting more than one 1 : 1 associations.

Revision: [1860]
Adding patch for Ticket #314

Revision: [1859]
Fixing Ticket #311

Revision: [1858] [1857]

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1863 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-25 22:40:17 +00:00
phpnut
26d7620f1b Merging fixes and enhancements into trunk
Revision: [1855]
Forgot to merge changes between the PHP 5 and PHP 4 model classes

Revision: [1854]
Added fix to Model class so that setting var $useTable = false; will not try to create a datasource connection.
Added fix to basics.php in the file_put_contents function that would give a Warning :failed to open stream: File exists. 
This fix allows the file to be wrote to if it already exists.
Added fix for undefined notice in DboSource::generateAssociationQuery();
Added Model::$keyToTable to map foreign keys to thier proper tables so scaffold could work with them properly.
Fixed Controller::__generateAssociation() to use Model::$keyToTable.
Fixed layout issue with show view in scaffold.

Revision: [1853]
Added DataSource::buildSchemaQuery() which must be implemented in the child classes.
  This will be used to import a table schema.
Added DboMysql::buildSchemaQuery()
Added fix for Ticket #304 by reverting change made in [1825].
Reopened Ticket #286
Added fix for Ticket #310 

Revision: [1852]
Added fix for PHP Fatal error: Call to a member function on a non-object in... Controller::generateFieldNames() in PHP 4            
when using a HABTM association. 

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1856 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-22 05:12:28 +00:00
phpnut
2407160dc5 Merging fixes and enhancements into trunk
Revision: [1848]
Fixing references.

Revision: [1847]
Adding fix for errors when using scaffold.
On some version of PHP 4 some people where getting Call to member function on non-object...
in Controller::generateFieldNames() at line 494.

Fixed call to get_class_methods that was using the name of the class and not the instance of the class,
this would cause a Wrong datatype for second argument...


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1849 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-20 18:43:05 +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
8a77108c44 Merging fixes to trunk
Revision: [1809]
Fixed self join code, may refactor after looking at it more. Currently it is working as expected.
Fixed errors in scaffold view caused by the changes I made.
Removed adding Child_ prefix to self joined associations.

Revision: [1808]
Adding changes I started on the self join code.

Revision: [1807]
Adding patch from Ticket #283.
Changed doc comment in SessionComponent class.
Added fix for Ticket #285 


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1810 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-16 21:34:46 +00:00
phpnut
3a971927d4 Merging changes into trunk
Revision: [1764]
Changed var $ds back to $db and var $source back to $table in beta.
Moved last error message out of the object class.                
Fixed PHP 4 error in home.thtml.

Revision: [1763]
Added changes made in model error handling lost in merge



git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1765 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-12 03:56:59 +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
28cb84e549 Merging:
Revision: [1729]
Fixed loading - added model, cakesession, security.
Now loads properly.

Revision: [1728]
Fixing problems found in the way Cake handles sessions.
These updates seem to work properly now.
Added gethost() to basics.php to replace using gethostbyaddr which can be very slow.
Added session_write_close(); in Controller::redirect();

Revision: [1719]
Fix scaffold show.thtml undefined index error

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1730 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-06 04:46:42 +00:00
phpnut
ff33f4405b Moving scaffolds to the view directory
git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1596 3807eeeb-6ff5-0310-8944-8be069107fe0
2005-12-23 22:04:03 +00:00
Renamed from cake/libs/controller/templates/scaffolds/show.thtml (Browse further)