Minor cosmetic updates
This commit is contained in:
@@ -30,10 +30,16 @@ class Model_VOLUME extends ORMTSM {
|
||||
),
|
||||
);
|
||||
|
||||
// Show the number of filespaces on a volume
|
||||
// $dtype is BACKUP or ARCHIVE
|
||||
public function getFSOnVol($dtype) {
|
||||
return $this->VOLUMEUSAGE->where('COPY_TYPE','=',$dtype)->find_all()->count();
|
||||
}
|
||||
|
||||
// Show the number of nodes on a volume
|
||||
// $dtype is BACKUP or ARCHIVE
|
||||
public function getNodesOnVol($dtype) {
|
||||
return $this->VOLUMEUSAGE->where('COPY_TYPE','=',$dtype)->find_all()->count();
|
||||
return $this->VOLUMEUSAGE->select('NODE_NAME')->distinct(TRUE)->where('COPY_TYPE','=',$dtype)->find_all()->count();
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
@@ -63,7 +63,7 @@ class ORM extends Kohana_ORM {
|
||||
if (isset($this->_object_formated[$column]))
|
||||
return $this->_object_formated[$column];
|
||||
else
|
||||
return $value ? $value : ' ';
|
||||
return strlen((string)$value) ? $value : ' ';
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
Reference in New Issue
Block a user