Changeset 268
- Timestamp:
- 06/25/07 12:59:06 (1 year ago)
- Files:
-
- trunk/lib/AkActionController.php (modified) (1 diff)
- trunk/lib/AkActionView/helpers/active_record_helper.php (modified) (1 diff)
- trunk/lib/AkLogger.php (modified) (1 diff)
- trunk/public/stylesheets/scaffold.css (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/AkActionController.php
r255 r268 574 574 $this->_addVariablesToAssigns(); 575 575 $this->Template->controller =& $this; 576 $this->$partial_path = $this->renderText($this->Template->renderPartial($partial_path, $object, $local_assigns), $status);576 $this->$partial_path = $this->renderText($this->Template->renderPartial($partial_path, $object, array_merge($this->_assigns, (array)$local_assigns)), $status); 577 577 return $this->$partial_path; 578 578 } trunk/lib/AkActionView/helpers/active_record_helper.php
r171 r268 181 181 function to_tag($options = array()) 182 182 { 183 $options = array_merge($this->object->getErrorsOn($this->method_name)==false?array():array("class"=>"fieldError"), $options); 184 183 185 switch ($this->get_column_type()) { 184 186 trunk/lib/AkLogger.php
r255 r268 29 29 30 30 // Default file logger settings 31 defined('AK_LOGER_DEFAULT_LOG_FILE') ? null : define('AK_LOGER_DEFAULT_LOG_FILE', AK_LOG_DIR.DS.AK_ HOST.'.log');31 defined('AK_LOGER_DEFAULT_LOG_FILE') ? null : define('AK_LOGER_DEFAULT_LOG_FILE', AK_LOG_DIR.DS.AK_ENVIRONMENT.'.log'); 32 32 33 33 // Loggin events for log types trunk/public/stylesheets/scaffold.css
r109 r268 193 193 } 194 194 195 hr {196 margin: 50px 0 0 0;197 border: 1px solid #eee;198 }199 200 195 .fieldWithErrors { 201 196 padding: 2px; … … 248 243 font-weight: bold; 249 244 } 245 246 .fieldError { 247 background-color:#fdd; 248 }
