deon/lnapp
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enabled defaults to ORM::display(), if values dont have a value

Browse Source
This commit is contained in:
Deon George 2015-10-08 16:31:33 +11:00
parent fdd06daed3
commit 01a370dcf2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/lnApp/ORM.php
View File

@ -190,10 +190,13 @@ abstract class lnApp_ORM extends Kohana_ORM {
/**
* Return a formated columns, as per the model definition
*/
public function display($column) {
public function display($column,$default='') {
// Trigger a load of the record.
$value = $this->__get($column);
if (! $value)
$value = $default;
// If some of our fields need to be formated for display purposes.
if (! $this->_formated AND $this->_display_filters)
$this->_format();

2
classes/lnApp/Site.php
View File

@ -21,7 +21,7 @@ abstract class lnApp_Site {
* Show a date using a site configured format
*/
public static function Date($date) {
return (is_null($date) OR ! $date) ? '' : date(Kohana::$config->load('config')->date_format,$date);
return (is_null($date) OR ! is_numeric($date)) ? $date : date(Kohana::$config->load('config')->date_format,$date);
}
/**