mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-03-18 07:29:51 +00:00
Merging fixes and enhancements into trunk.
Revision: [2129] Removed Scaffold::__renderScaffold(); Added more detailed Page Title. Revision: [2128] Renamed Scaffold::__scaffoldView to Scaffold::__scaffoldIndex Removed all Scaffold::__scaffoldIndex () Revision: [2127] Removing Scaffold::__scaffoldNew() and Scaffold::__scaffoldEdit() Revision: [2126] Added Scaffold::__scaffoldForm() to replace Scaffold::__scaffoldNew() and Scaffold::__scaffoldEdit() Revision: [2125] Removed Scaffold::__scaffoldCreate() and Scaffold::__scaffoldUpdate() Revision: [2124] Refactoring Scaffold class. Added Scaffold::__scaffoldSave() to replace Scaffold::__scaffoldCreate() and Scaffold::__scaffoldUpdate() Revision: [2123] Removed debug code Revision: [2122] Added fix for Ticket #435. Select boxes now repopulate with the selected values pass in the form git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2130 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut
parent
7a9fff407a
commit
80d6673717
2 changed files with 103 additions and 152 deletions
|
|
@ -6,4 +6,4 @@
|
||||||
// +---------------------------------------------------------------------------------------------------+ //
|
// +---------------------------------------------------------------------------------------------------+ //
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
0.10.8.2121
|
0.10.8.2130
|
||||||
|
|
@ -98,34 +98,11 @@ class Scaffold extends Object {
|
||||||
$this->scaffoldTitle = Inflector::humanize($this->modelKey);
|
$this->scaffoldTitle = Inflector::humanize($this->modelKey);
|
||||||
$this->viewPath = Inflector::underscore($controller->name);
|
$this->viewPath = Inflector::underscore($controller->name);
|
||||||
$this->controllerClass->pageTitle = $this->scaffoldTitle;
|
$this->controllerClass->pageTitle = $this->scaffoldTitle;
|
||||||
$this->__renderScaffold($params);
|
$this->controllerClass->pageTitle = 'Scaffold :: ' . Inflector::humanize($controller->action) . ' :: ' .
|
||||||
}
|
Inflector::humanize(Inflector::pluralize($this->modelKey));
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Private method to render Scaffold.
|
|
||||||
*
|
|
||||||
* @param array $params
|
|
||||||
* @access private
|
|
||||||
*/
|
|
||||||
function __renderScaffold($params)
|
|
||||||
{
|
|
||||||
$this->__scaffoldView($params);
|
$this->__scaffoldView($params);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Renders the List view as the default action (index).
|
|
||||||
*
|
|
||||||
* @param array $params
|
|
||||||
* @return Scaffold::__scaffoldList();
|
|
||||||
* @access private
|
|
||||||
*/
|
|
||||||
function __scaffoldIndex($params)
|
|
||||||
{
|
|
||||||
$this->controllerClass->pageTitle = Inflector::humanize(Inflector::pluralize($this->modelKey));
|
|
||||||
return $this->__scaffoldList($params);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renders a Show view of scaffolded Model.
|
* Renders a Show view of scaffolded Model.
|
||||||
*
|
*
|
||||||
|
|
@ -166,7 +143,7 @@ class Scaffold extends Object {
|
||||||
* @return A rendered view listing rows from Models database table
|
* @return A rendered view listing rows from Models database table
|
||||||
* @access private
|
* @access private
|
||||||
*/
|
*/
|
||||||
function __scaffoldList($params)
|
function __scaffoldIndex($params)
|
||||||
{
|
{
|
||||||
if($this->controllerClass->_beforeScaffold('index'))
|
if($this->controllerClass->_beforeScaffold('index'))
|
||||||
{
|
{
|
||||||
|
|
@ -192,66 +169,53 @@ class Scaffold extends Object {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new scaffold.
|
* Renders an Add or Edit view for scaffolded Model.
|
||||||
*
|
*
|
||||||
* @param array $params
|
* @param array $params
|
||||||
* @return A rendered view with a form to create a new row in the Models database table
|
* @param string $params add or new
|
||||||
|
* @return A rendered view with a form to edit or add a record in the Models database table
|
||||||
* @access private
|
* @access private
|
||||||
*/
|
*/
|
||||||
function __scaffoldNew($params)
|
function __scaffoldForm($params=array(), $type)
|
||||||
{
|
{
|
||||||
if($this->controllerClass->_beforeScaffold('add'))
|
$thtml = 'edit';
|
||||||
{
|
$form = 'Edit';
|
||||||
$this->controllerClass->set('fieldNames', $this->controllerClass->generateFieldNames() );
|
|
||||||
$this->controllerClass->set('type', 'New');
|
|
||||||
if(file_exists(APP.'views'.DS.$this->viewPath.DS.'scaffold.new.thtml'))
|
|
||||||
{
|
|
||||||
return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.$this->viewPath.DS.'scaffold.new.thtml');
|
|
||||||
}
|
|
||||||
elseif(file_exists(APP.'views'.DS.'scaffold'.DS.'scaffold.new.thtml'))
|
|
||||||
{
|
|
||||||
return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.'scaffold'.DS.'scaffold.new.thtml');
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return $this->controllerClass->render($this->actionView, '', LIBS.'view'.DS.'templates'.DS.'scaffolds'.DS.'edit.thtml');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if($this->controllerClass->_scaffoldError('add') === false)
|
|
||||||
{
|
|
||||||
return $this->__scaffoldError();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
if($type === 'add')
|
||||||
* Renders an Edit view for scaffolded Model.
|
|
||||||
*
|
|
||||||
* @param array $params
|
|
||||||
* @return A rendered view with a form to edit a record in the Models database table
|
|
||||||
* @access private
|
|
||||||
*/
|
|
||||||
function __scaffoldEdit($params=array())
|
|
||||||
{
|
|
||||||
if($this->controllerClass->_beforeScaffold('edit'))
|
|
||||||
{
|
{
|
||||||
$this->controllerClass->params['data'] = $this->controllerClass->{$this->modelKey}->read();
|
$thtml = 'new';
|
||||||
$this->controllerClass->set('fieldNames', $this->controllerClass->generateFieldNames($this->controllerClass->params['data']) );
|
$form = 'New';
|
||||||
$this->controllerClass->set('type', 'Edit');
|
}
|
||||||
$this->controllerClass->set('data', $this->controllerClass->params['data']);
|
|
||||||
if(file_exists(APP.'views'.DS.$this->viewPath.DS.'scaffold.edit.thtml'))
|
if($this->controllerClass->_beforeScaffold($type))
|
||||||
|
{
|
||||||
|
if($type == 'edit')
|
||||||
{
|
{
|
||||||
return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.$this->viewPath.DS.'scaffold.edit.thtml');
|
$this->controllerClass->params['data'] = $this->controllerClass->{$this->modelKey}->read();
|
||||||
|
$this->controllerClass->set('fieldNames', $this->controllerClass->generateFieldNames($this->controllerClass->params['data']) );
|
||||||
|
$this->controllerClass->set('data', $this->controllerClass->params['data']);
|
||||||
}
|
}
|
||||||
elseif(file_exists(APP.'views'.DS.'scaffold'.DS.'scaffold.new.thtml'))
|
else
|
||||||
{
|
{
|
||||||
return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.'scaffold'.DS.'scaffold.edit.thtml');
|
$this->controllerClass->set('fieldNames', $this->controllerClass->generateFieldNames());
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->controllerClass->set('type', $form);
|
||||||
|
|
||||||
|
if(file_exists(APP.'views'.DS.$this->viewPath.DS.'scaffold.'.$thtml.'.thtml'))
|
||||||
|
{
|
||||||
|
return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.$this->viewPath.DS.'scaffold.'.$thtml.'.thtml');
|
||||||
|
}
|
||||||
|
elseif(file_exists(APP.'views'.DS.'scaffold'.DS.'scaffold.'.$thtml.'.thtml'))
|
||||||
|
{
|
||||||
|
return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.'scaffold'.DS.'scaffold.'.$thtml.'.thtml');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return $this->controllerClass->render($this->actionView, '', LIBS.'view'.DS.'templates'.DS.'scaffolds'.DS.'edit.thtml');
|
return $this->controllerClass->render($this->actionView, '', LIBS.'view'.DS.'templates'.DS.'scaffolds'.DS.'edit.thtml');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if($this->controllerClass->_scaffoldError('edit') === false)
|
else if($this->controllerClass->_scaffoldError($type) === false)
|
||||||
{
|
{
|
||||||
return $this->__scaffoldError();
|
return $this->__scaffoldError();
|
||||||
}
|
}
|
||||||
|
|
@ -259,96 +223,54 @@ class Scaffold extends Object {
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renders a "create new" view for scaffolded Model.
|
*
|
||||||
|
* Saves or updates a model.
|
||||||
*
|
*
|
||||||
* @param array $params
|
* @param array $params
|
||||||
* @return success on save new form if data is empty or if data does not validate
|
* @param string $type create or update
|
||||||
|
* @return success on save/update, new/edit form if data is empty or error if save or update fails
|
||||||
* @access private
|
* @access private
|
||||||
*/
|
*/
|
||||||
function __scaffoldCreate($params)
|
function __scaffoldSave($params = array(), $type)
|
||||||
{
|
{
|
||||||
if($this->controllerClass->_beforeScaffold('create'))
|
$thtml = 'edit';
|
||||||
|
$form = 'Edit';
|
||||||
|
$success = 'updated';
|
||||||
|
$formError = 'edit';
|
||||||
|
|
||||||
|
if($this->controllerClass->_beforeScaffold($type))
|
||||||
{
|
{
|
||||||
if(empty($this->controllerClass->params['data']))
|
if(empty($this->controllerClass->params['data']))
|
||||||
{
|
{
|
||||||
return $this->__scaffoldNew($params);
|
if($type === 'create')
|
||||||
|
{
|
||||||
|
$formError = 'add';
|
||||||
|
}
|
||||||
|
return $this->__scaffoldForm($params, $formError);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->controllerClass->set('fieldNames', $this->controllerClass->generateFieldNames() );
|
$this->controllerClass->set('fieldNames', $this->controllerClass->generateFieldNames() );
|
||||||
$this->controllerClass->cleanUpFields();
|
$this->controllerClass->cleanUpFields();
|
||||||
|
|
||||||
|
|
||||||
|
if($type == 'create')
|
||||||
|
{
|
||||||
|
$this->controllerClass->{$this->modelKey}->create();
|
||||||
|
$thtml = 'new';
|
||||||
|
$form = 'New';
|
||||||
|
$success = 'saved';
|
||||||
|
}
|
||||||
|
|
||||||
if ($this->controllerClass->{$this->modelKey}->save($this->controllerClass->params['data']))
|
if ($this->controllerClass->{$this->modelKey}->save($this->controllerClass->params['data']))
|
||||||
{
|
{
|
||||||
if(is_object($this->controllerClass->Session))
|
if(is_object($this->controllerClass->Session))
|
||||||
{
|
{
|
||||||
$this->controllerClass->Session->setFlash('Your '.Inflector::humanize($this->modelKey).' has been saved.');
|
$this->controllerClass->Session->setFlash('The '.Inflector::humanize($this->modelKey).' has been '.$success.'.', '/');
|
||||||
$this->controllerClass->redirect(Inflector::underscore($this->controllerClass->viewPath));
|
$this->controllerClass->redirect(Inflector::underscore($this->controllerClass->viewPath));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return $this->controllerClass->flash('Your '.Inflector::humanize($this->modelKey).' has been saved.', '/'.
|
return $this->controllerClass->flash('The '.Inflector::humanize($this->modelKey).' has been '.$success.'.','/'.
|
||||||
Inflector::underscore($this->controllerClass->viewPath) );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if(is_object($this->controllerClass->Session))
|
|
||||||
{
|
|
||||||
$this->controllerClass->Session->setFlash('Please correct errors below');
|
|
||||||
}
|
|
||||||
$this->controllerClass->set('data', $this->controllerClass->params['data']);
|
|
||||||
$this->controllerClass->validateErrors($this->controllerClass->{$this->modelKey});
|
|
||||||
$this->controllerClass->set('type', 'New');
|
|
||||||
if(file_exists(APP.'views'.DS.$this->viewPath.DS.'scaffolds'.DS.'new.thtml'))
|
|
||||||
{
|
|
||||||
return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.$this->viewPath.DS.'scaffolds'.DS.'new.thtml');
|
|
||||||
}
|
|
||||||
elseif(file_exists(APP.'views'.DS.'scaffold'.DS.'scaffold.new.thtml'))
|
|
||||||
{
|
|
||||||
return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.'scaffold'.DS.'scaffold.new.thtml');
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return $this->controllerClass->render($this->actionView, '', LIBS.'view'.DS.'templates'.DS.'scaffolds'.DS.'edit.thtml');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if($this->controllerClass->_scaffoldError('create') === false)
|
|
||||||
{
|
|
||||||
return $this->__scaffoldError();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Renders an update view for scaffolded Model.
|
|
||||||
*
|
|
||||||
* @param array $params
|
|
||||||
* @return success on save new form if data is empty or error if update fails
|
|
||||||
* @access private
|
|
||||||
*/
|
|
||||||
function __scaffoldUpdate($params=array())
|
|
||||||
{
|
|
||||||
if($this->controllerClass->_beforeScaffold('update'))
|
|
||||||
{
|
|
||||||
if(empty($this->controllerClass->params['data']))
|
|
||||||
{
|
|
||||||
return $this->__scaffoldNew($params);
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->controllerClass->set('fieldNames', $this->controllerClass->generateFieldNames() );
|
|
||||||
$this->controllerClass->cleanUpFields();
|
|
||||||
$this->controllerClass->{$this->modelKey}->set($this->controllerClass->params['data']);
|
|
||||||
|
|
||||||
if ( $this->controllerClass->{$this->modelKey}->save())
|
|
||||||
{
|
|
||||||
if(is_object($this->controllerClass->Session))
|
|
||||||
{
|
|
||||||
$this->controllerClass->Session->setFlash('Your '.Inflector::humanize($this->modelKey).' has been saved.', '/');
|
|
||||||
$this->controllerClass->redirect(Inflector::underscore($this->controllerClass->viewPath));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return $this->controllerClass->flash('The '.Inflector::humanize($this->modelKey).' has been updated.','/'.
|
|
||||||
Inflector::underscore($this->controllerClass->viewPath));
|
Inflector::underscore($this->controllerClass->viewPath));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -358,16 +280,17 @@ class Scaffold extends Object {
|
||||||
{
|
{
|
||||||
$this->controllerClass->Session->setFlash('Please correct errors below');
|
$this->controllerClass->Session->setFlash('Please correct errors below');
|
||||||
}
|
}
|
||||||
$this->controllerClass->validateErrors($this->controllerClass->{$this->modelKey});
|
|
||||||
$this->controllerClass->set('data', $this->controllerClass->params['data']);
|
$this->controllerClass->set('data', $this->controllerClass->params['data']);
|
||||||
$this->controllerClass->set('type', 'Edit');
|
$this->controllerClass->set('fieldNames', $this->controllerClass->generateFieldNames($this->__rebuild($this->controllerClass->params['data'])));
|
||||||
if(file_exists(APP.'views'.DS.$this->viewPath.DS.'scaffolds'.DS.'new.thtml'))
|
$this->controllerClass->validateErrors($this->controllerClass->{$this->modelKey});
|
||||||
|
$this->controllerClass->set('type', $form);
|
||||||
|
if(file_exists(APP.'views'.DS.$this->viewPath.DS.'scaffolds'.DS.'scaffold.'.$thtml.'.thtml'))
|
||||||
{
|
{
|
||||||
return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.$this->viewPath.DS.'scaffolds'.DS.'edit.thtml');
|
return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.$this->viewPath.DS.'scaffolds'.DS.'scaffold.'.$thtml.'.thtml');
|
||||||
}
|
}
|
||||||
elseif(file_exists(APP.'views'.DS.'scaffold'.DS.'scaffold.new.thtml'))
|
elseif(file_exists(APP.'views'.DS.'scaffold'.DS.'scaffold.'.$thtml.'.thtml'))
|
||||||
{
|
{
|
||||||
return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.'scaffold'.DS.'scaffold.edit.thtml');
|
return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.'scaffold'.DS.'scaffold.'.$thtml.'.thtml');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -375,7 +298,7 @@ class Scaffold extends Object {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if($this->controllerClass->_scaffoldError('update') === false)
|
else if($this->controllerClass->_scaffoldError($type) === false)
|
||||||
{
|
{
|
||||||
return $this->__scaffoldError();
|
return $this->__scaffoldError();
|
||||||
}
|
}
|
||||||
|
|
@ -447,6 +370,34 @@ class Scaffold extends Object {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When forms are submited the arrays need to be rebuilt if
|
||||||
|
* an error occured, here the arrays are rebuilt to structure needed
|
||||||
|
*
|
||||||
|
* @param array $params data passed to forms
|
||||||
|
* @return array rebuilds the association arrays to pass back to Controller::generateFieldNames()
|
||||||
|
*/
|
||||||
|
function __rebuild($params)
|
||||||
|
{
|
||||||
|
foreach ($params as $model => $field)
|
||||||
|
{
|
||||||
|
if(!empty($field) && is_array($field))
|
||||||
|
{
|
||||||
|
$match = array_keys($field);
|
||||||
|
if($model == $match[0])
|
||||||
|
{
|
||||||
|
$count = 0;
|
||||||
|
foreach ($field[$model] as $value)
|
||||||
|
{
|
||||||
|
$params[$model][$count][$this->controllerClass->{$this->modelKey}->{$model}->primaryKey] = $value;
|
||||||
|
$count++;
|
||||||
|
}
|
||||||
|
unset($params[$model][$model]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $params;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* When methods are now present in a controller
|
* When methods are now present in a controller
|
||||||
|
|
@ -488,23 +439,23 @@ class Scaffold extends Object {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'list':
|
case 'list':
|
||||||
$this->__scaffoldList($params);
|
$this->__scaffoldIndex($params);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'add':
|
case 'add':
|
||||||
$this->__scaffoldNew($params);
|
$this->__scaffoldForm($params, 'add');
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'edit':
|
case 'edit':
|
||||||
$this->__scaffoldEdit($params);
|
$this->__scaffoldForm($params, 'edit');
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'create':
|
case 'create':
|
||||||
$this->__scaffoldCreate($params);
|
$this->__scaffoldSave($params, 'create');
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'update':
|
case 'update':
|
||||||
$this->__scaffoldUpdate($params);
|
$this->__scaffoldSave($params, 'update');
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'delete':
|
case 'delete':
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue