adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updating bake view templates

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5266 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-06-08 16:30:22 +00:00
parent 1737dba3d6
commit 95bb7e0f04
4 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/console/libs/templates/views/form.ctp
View file

@ -38,7 +38,7 @@
} }
} }
foreach($hasAndBelongsToMany as $assocName => $assocData) { foreach($hasAndBelongsToMany as $assocName => $assocData) {
echo "\t\techo \$form->input('{$assocName}.{$assocName}');\n"; echo "\t\techo \$form->input('{$assocName}');\n";
} }
echo "\t?>\n"; echo "\t?>\n";
?> ?>

3
cake/console/libs/templates/views/index.ctp
View file

@ -51,6 +51,9 @@ foreach(\${$pluralVar} as \${$singularVar}):
$otherModelKey = Inflector::underscore($otherModelClass); $otherModelKey = Inflector::underscore($otherModelClass);
$otherControllerName = Inflector::pluralize($otherModelClass); $otherControllerName = Inflector::pluralize($otherModelClass);
$otherControllerPath = Inflector::underscore($otherControllerName); $otherControllerPath = Inflector::underscore($otherControllerName);
if(isset($foreignKeys[$field['name']][2])) {
$otherModelClass = $foreignKeys[$field['name']][2];
}
$otherVariableName = Inflector::variable($otherModelClass); $otherVariableName = Inflector::variable($otherModelClass);
$otherModelObj =& ClassRegistry::getObject($otherModelKey); $otherModelObj =& ClassRegistry::getObject($otherModelKey);
$otherPrimaryKey = $otherModelObj->primaryKey; $otherPrimaryKey = $otherModelObj->primaryKey;

3
cake/console/libs/templates/views/view.ctp
View file

@ -40,6 +40,9 @@ foreach($fields as $field) {
$otherModelKey = Inflector::underscore($otherModelClass); $otherModelKey = Inflector::underscore($otherModelClass);
$otherControllerName = Inflector::pluralize($otherModelClass); $otherControllerName = Inflector::pluralize($otherModelClass);
$otherControllerPath = Inflector::underscore($otherControllerName); $otherControllerPath = Inflector::underscore($otherControllerName);
if(isset($foreignKeys[$field['name']][2])) {
$otherModelClass = $foreignKeys[$field['name']][2];
}
$otherSingularVar = Inflector::variable($otherModelClass); $otherSingularVar = Inflector::variable($otherModelClass);
$otherModelObj =& ClassRegistry::getObject($otherModelKey); $otherModelObj =& ClassRegistry::getObject($otherModelKey);
$otherPrimaryKey = $otherModelObj->primaryKey; $otherPrimaryKey = $otherModelObj->primaryKey;

3
cake/libs/model/model.php
View file

@ -722,6 +722,9 @@ class Model extends Overloadable {
if ($key == 'foreignKey' && !isset($this->keyToTable[$this->{$type}[$assocKey][$key]])) { if ($key == 'foreignKey' && !isset($this->keyToTable[$this->{$type}[$assocKey][$key]])) {
$this->keyToTable[$this->{$type}[$assocKey][$key]][0] = $this->{$class}->table; $this->keyToTable[$this->{$type}[$assocKey][$key]][0] = $this->{$class}->table;
$this->keyToTable[$this->{$type}[$assocKey][$key]][1] = $this->{$class}->name; $this->keyToTable[$this->{$type}[$assocKey][$key]][1] = $this->{$class}->name;
if($this->{$class}->name != $class) {
$this->keyToTable[$this->{$type}[$assocKey][$key]][2] = $class;
}
} }
} }
if (isset($this->{$type}[$assocKey]['with'])) { if (isset($this->{$type}[$assocKey]['with'])) {