From 524d3d233d7b2dbd06cdb78e23f4181b4175506e Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 18 Nov 2013 01:32:22 -0500 Subject: [PATCH] Added count of assets in asset models table --- app/lang/en/admin/models/table.php | 1 + app/models/Model.php | 14 ++++++++++---- app/views/backend/models/index.blade.php | 10 ++++++++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/lang/en/admin/models/table.php b/app/lang/en/admin/models/table.php index 3232c9d828..19f1969f31 100755 --- a/app/lang/en/admin/models/table.php +++ b/app/lang/en/admin/models/table.php @@ -5,5 +5,6 @@ return array( 'title' => 'Asset Model Name', 'modelnumber' => 'Model No.', 'created_at' => 'Created at', + 'numassets' => 'Assets', ); diff --git a/app/models/Model.php b/app/models/Model.php index 112654f82f..6508caed4a 100644 --- a/app/models/Model.php +++ b/app/models/Model.php @@ -2,9 +2,15 @@ class Model extends Elegant { - // Declare the rules for the form validation - protected $rules = array( - 'name' => 'required|min:3', - ); + // Declare the rules for the form validation + protected $rules = array( + 'name' => 'required|min:3', + ); + + public function assets() + { + return $this->hasMany('Asset', 'model_id'); + + } } diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php index cb2c8c8543..04a8ac0feb 100755 --- a/app/views/backend/models/index.blade.php +++ b/app/views/backend/models/index.blade.php @@ -24,7 +24,8 @@ Asset Models :: @lang('admin/models/table.title') - @lang('admin/models/table.modelnumber') + @lang('admin/models/table.modelnumber') + @lang('admin/models/table.numassets') @lang('admin/models/table.created_at') @lang('table.actions') @@ -32,8 +33,13 @@ Asset Models :: @foreach ($models as $model) - {{ $model->name }} + {{ $model->name }} + + + + {{ $model->modelno }} + {{ ($model->assets->count()) }} {{ $model->created_at->diffForHumans() }} @lang('button.edit')