Merge branch '1.3-console' into 1.3

Conflicts:
	cake/console/libs/tasks/fixture.php
This commit is contained in:
mark_story 2009-09-27 16:26:45 -04:00
commit bc90f0aa01
16 changed files with 246 additions and 389 deletions

View file

@ -222,7 +222,7 @@ class ControllerTask extends Shell {
* @return void
**/
function confirmController($controllerName, $useDynamicScaffold, $helpers, $components) {
$this->out('');
$this->out();
$this->hr();
$this->out(__('The following controller will be created:', true));
$this->hr();
@ -457,27 +457,27 @@ class ControllerTask extends Shell {
$this->out("Usage: cake bake controller <arg1> <arg2>...");
$this->hr();
$this->out('Commands:');
$this->out('');
$this->out();
$this->out("controller <name>");
$this->out("\tbakes controller with var \$scaffold");
$this->out('');
$this->out();
$this->out("controller <name> public");
$this->out("\tbakes controller with basic crud actions");
$this->out("\t(index, view, add, edit, delete)");
$this->out('');
$this->out();
$this->out("controller <name> admin");
$this->out("\tbakes a controller with basic crud actions for");
$this->out("\tConfigure::read('Routing.admin') methods.");
$this->out('');
$this->out();
$this->out("controller <name> public admin");
$this->out("\tbakes a controller with basic crud actions for");
$this->out("\tConfigure::read('Routing.admin') and non admin methods.");
$this->out("\t(index, view, add, edit, delete,");
$this->out("\tadmin_index, admin_view, admin_edit, admin_add, admin_delete)");
$this->out('');
$this->out();
$this->out("controller all");
$this->out("\tbakes all controllers with CRUD methods.");
$this->out("");
$this->out();
$this->_stop();
}
}