Changeset 268

Show
Ignore:
Timestamp:
06/25/07 12:59:06 (1 year ago)
Author:
bermiferrer
Message:

Fixing assigns issue in renderPartial
Changing the default log file name to development/testing/production .log
Adding new style to highlight error fields in the active record helper and in the scaffold.css

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lib/AkActionController.php

    r255 r268  
    574574        $this->_addVariablesToAssigns(); 
    575575        $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); 
    577577        return $this->$partial_path; 
    578578    } 
  • trunk/lib/AkActionView/helpers/active_record_helper.php

    r171 r268  
    181181    function to_tag($options = array()) 
    182182    { 
     183        $options = array_merge($this->object->getErrorsOn($this->method_name)==false?array():array("class"=>"fieldError"), $options); 
     184         
    183185        switch ($this->get_column_type()) { 
    184186 
  • trunk/lib/AkLogger.php

    r255 r268  
    2929 
    3030// 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'); 
     31defined('AK_LOGER_DEFAULT_LOG_FILE')            ? null : define('AK_LOGER_DEFAULT_LOG_FILE', AK_LOG_DIR.DS.AK_ENVIRONMENT.'.log'); 
    3232 
    3333// Loggin events for log types 
  • trunk/public/stylesheets/scaffold.css

    r109 r268  
    193193} 
    194194 
    195 hr { 
    196   margin: 50px 0 0 0; 
    197   border: 1px solid #eee; 
    198 } 
    199  
    200195.fieldWithErrors { 
    201196  padding: 2px; 
     
    248243  font-weight: bold; 
    249244} 
     245 
     246.fieldError { 
     247  background-color:#fdd; 
     248}