Skip to content

Commit

Permalink
Adding omitted documentation information.
Browse files Browse the repository at this point in the history
  • Loading branch information
markstory committed Jun 10, 2010
1 parent ec5ad93 commit e5df32e
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 12 deletions.
8 changes: 7 additions & 1 deletion cake/libs/controller/scaffold.php
Expand Up @@ -544,11 +544,17 @@ function __associations() {
App::import('View', 'Theme');
}

/**
* ScaffoldView provides specific view file loading features for scaffolded views.
*
* @package cake.libs.view
*/
class ScaffoldView extends ThemeView {

/**
* Override _getViewFileName
* Override _getViewFileName Appends special scaffolding views in.
*
* @param string $name name of the view file to get.
* @return string action
* @access protected
*/
Expand Down
33 changes: 24 additions & 9 deletions cake/libs/model/behaviors/translate.php
Expand Up @@ -29,6 +29,8 @@ class TranslateBehavior extends ModelBehavior {

/**
* Used for runtime configuration of model
*
* @var array
*/
var $runtime = array();

Expand All @@ -45,7 +47,8 @@ class TranslateBehavior extends ModelBehavior {
* $config could be empty - and translations configured dynamically by
* bindTranslation() method
*
* @param array $config
* @param Model $model Model the behavior is being attached to.
* @param array $config Array of configuration information.
* @return mixed
* @access public
*/
Expand All @@ -66,8 +69,9 @@ function setup(&$model, $config = array()) {
}

/**
* Callback
* Cleanup Callback unbinds bound translations and deletes setting information.
*
* @param Model $model Model being detached.
* @return void
* @access public
*/
Expand All @@ -80,7 +84,8 @@ function cleanup(&$model) {
/**
* beforeFind Callback
*
* @param array $query
* @param Model $model Model find is being run on.
* @param array $query Array of Query parameters.
* @return array Modified query
* @access public
*/
Expand Down Expand Up @@ -205,8 +210,9 @@ function beforeFind(&$model, $query) {
/**
* afterFind Callback
*
* @param array $results
* @param boolean $primary
* @param Model $model Model find was run on
* @param array $results Array of model results.
* @param boolean $primary Did the find originate on $model.
* @return array Modified results
* @access public
*/
Expand Down Expand Up @@ -250,6 +256,7 @@ function afterFind(&$model, $results, $primary) {
/**
* beforeValidate Callback
*
* @param Model $model Model invalidFields was called on.
* @return boolean
* @access public
*/
Expand Down Expand Up @@ -283,7 +290,8 @@ function beforeValidate(&$model) {
/**
* afterSave Callback
*
* @param boolean $created
* @param Model $model Model the callback is called on
* @param boolean $created Whether or not the save created a record.
* @return void
* @access public
*/
Expand Down Expand Up @@ -327,6 +335,7 @@ function afterSave(&$model, $created) {
/**
* afterDelete Callback
*
* @param Model $model Model the callback was run on.
* @return void
* @access public
*/
Expand All @@ -339,6 +348,7 @@ function afterDelete(&$model) {
/**
* Get selected locale for model
*
* @param Model $model Model the locale needs to be set/get on.
* @return mixed string or false
* @access protected
*/
Expand All @@ -356,8 +366,12 @@ function _getLocale(&$model) {
}

/**
* Get instance of model for translations
* Get instance of model for translations.
*
* If the model has a translateModel property set, this will be used as the class
* name to find/use. If no translateModel property is found 'I18nModel' will be used.
*
* @param Model $model Model to get a translatemodel for.
* @return object
* @access public
*/
Expand Down Expand Up @@ -461,8 +475,9 @@ function bindTranslation(&$model, $fields, $reset = true) {
* Unbind translation for fields, optionally unbinds hasMany association for
* fake field
*
* @param object instance of model
* @param mixed string with field, or array(field1, field2=>AssocName, field3), or null for unbind all original translations
* @param object $model instance of model
* @param mixed $fields string with field, or array(field1, field2=>AssocName, field3), or null for
* unbind all original translations
* @return bool
*/
function unbindTranslation(&$model, $fields = null) {
Expand Down
5 changes: 3 additions & 2 deletions cake/libs/view/theme.php
Expand Up @@ -35,7 +35,8 @@ class ThemeView extends View {
/**
* Constructor for ThemeView sets $this->theme.
*
* @param Controller $controller
* @param Controller $controller Controller object to be rendered.
* @param boolean $register Should the view be registered in the registry.
*/
function __construct(&$controller, $register = true) {
parent::__construct($controller, $register);
Expand All @@ -45,7 +46,7 @@ function __construct(&$controller, $register = true) {
/**
* Return all possible paths to find view files in order
*
* @param string $plugin
* @param string $plugin The name of the plugin views are being found for.
* @param boolean $cached Set to true to force dir scan.
* @return array paths
* @access protected
Expand Down

0 comments on commit e5df32e

Please sign in to comment.