Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '1.2' of code.cakephp.org:cakephp into 1.2

  • Loading branch information...
commit 0949ea912d07178a8f5ad5b46e0037581d017a93 2 parents eb43faf + 34deb2a
@jperras jperras authored
View
2  cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -905,7 +905,7 @@ function renderStatement($type, $data) {
switch (strtolower($type)) {
case 'select':
- return "SELECT {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$order} {$limit}";
+ return "SELECT {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order} {$limit}";
break;
case 'create':
return "INSERT INTO {$table} ({$fields}) VALUES ({$values})";
View
21 cake/libs/view/helpers/form.php
@@ -474,13 +474,24 @@ function label($fieldName = null, $text = null, $attributes = array()) {
));
}
/**
- * Will display all the fields passed in an array expects fieldName as an array key
- * replaces generateFields
+ * Generate a set of inputs for `$fields`. If $fields is null the current model
+ * will be used.
*
+ * In addition to controller fields output, `$fields` can be used to control legend
+ * and fieldset rendering with the `fieldset` and `legend` keys.
+ * `$form->inputs(array('legend' => 'My legend'));` Would generate an input set with
+ * a custom legend. You can customize individual inputs through `$fields` as well.
+ *
+ * {{{
+ * $form->inputs(array(
+ * 'name' => array('label' => 'custom label')
+ * ));
+ * }}}
+ *
+ * @param mixed $fields An array of fields to generate inputs for, or null.
+ * @param array $blacklist a simple array of fields to skip.
+ * @return string Completed form inputs.
* @access public
- * @param array $fields works well with Controller::generateFields() or on its own;
- * @param array $blacklist a simple array of fields to skip
- * @return output
*/
function inputs($fields = null, $blacklist = null) {
$fieldset = $legend = true;
Please sign in to comment.
Something went wrong with that request. Please try again.