From d2423b2fc8fec80091578ce119a02d06235d3687 Mon Sep 17 00:00:00 2001 From: Abdullah Alansari Date: Wed, 18 Nov 2015 18:41:25 +0300 Subject: [PATCH] Show company name for the remaining entities --- app/controllers/admin/AssetMaintenancesController.php | 4 ++-- app/controllers/admin/CategoriesController.php | 8 ++++---- app/controllers/admin/ManufacturersController.php | 2 +- app/controllers/admin/ModelsController.php | 8 +++++--- app/models/Company.php | 4 ++-- app/views/backend/categories/view.blade.php | 3 +++ app/views/backend/manufacturers/view.blade.php | 3 +++ app/views/backend/models/view.blade.php | 1 + 8 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/controllers/admin/AssetMaintenancesController.php b/app/controllers/admin/AssetMaintenancesController.php index 24df97c9f3..d5016a5a15 100644 --- a/app/controllers/admin/AssetMaintenancesController.php +++ b/app/controllers/admin/AssetMaintenancesController.php @@ -217,7 +217,7 @@ $asset = Asset::find( e( Input::get( 'asset_id' ) ) ); - if (is_null($asset) || !Company::isCurrentUserHasAccess($asset)) { + if (!Company::isCurrentUserHasAccess($asset)) { return static::getInsufficientPermissionsRedirect(); } @@ -384,7 +384,7 @@ $asset = Asset::find( e( Input::get( 'asset_id' ) ) ); - if (is_null($asset) || !Company::isCurrentUserHasAccess($asset)) { + if (!Company::isCurrentUserHasAccess($asset)) { return static::getInsufficientPermissionsRedirect(); } diff --git a/app/controllers/admin/CategoriesController.php b/app/controllers/admin/CategoriesController.php index f77edc22a6..cd706d68d8 100755 --- a/app/controllers/admin/CategoriesController.php +++ b/app/controllers/admin/CategoriesController.php @@ -4,6 +4,7 @@ use AdminController; use Input; use Lang; use Category; +use Company; use Redirect; use Setting; use DB; @@ -269,7 +270,7 @@ class CategoriesController extends AdminController public function getDataView($categoryID) { - $category = Category::find($categoryID); + $category = Category::with('assets.company')->find($categoryID); $category_assets = $category->assets; if (Input::has('search')) { @@ -300,7 +301,7 @@ class CategoriesController extends AdminController $actions = ''; $inout=''; - + if ($asset->deleted_at=='') { $actions = '
'; } elseif ($asset->deleted_at!='') { @@ -326,8 +327,7 @@ class CategoriesController extends AdminController 'assigned_to' => ($asset->assigneduser) ? link_to('/admin/users/'.$asset->assigneduser->id.'/view', $asset->assigneduser->fullName()): '', 'change' => $inout, 'actions' => $actions, - - + 'companyName' => Company::getName($asset), ); } diff --git a/app/controllers/admin/ManufacturersController.php b/app/controllers/admin/ManufacturersController.php index 0c673e5c55..87f579c9d6 100755 --- a/app/controllers/admin/ManufacturersController.php +++ b/app/controllers/admin/ManufacturersController.php @@ -243,7 +243,7 @@ class ManufacturersController extends AdminController public function getDataView($manufacturerID) { - $manufacturer = Manufacturer::find($manufacturerID); + $manufacturer = Manufacturer::with('assets.company')->find($manufacturerID); $manufacturer_assets = $manufacturer->assets; if (Input::has('search')) { diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php index d92cfa5392..abef2cd9ef 100755 --- a/app/controllers/admin/ModelsController.php +++ b/app/controllers/admin/ModelsController.php @@ -16,6 +16,7 @@ use Validator; use View; use Datatable; use Asset; +use Company; //use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\JsonResponse; @@ -447,7 +448,7 @@ class ModelsController extends AdminController **/ public function getDataView($modelID) { - $assets = Asset::where('model_id','=',$modelID)->withTrashed(); + $assets = Asset::where('model_id','=',$modelID)->withTrashed()->with('company'); if (Input::has('search')) { $assets = $assets->TextSearch(Input::get('search')); @@ -490,8 +491,9 @@ class ModelsController extends AdminController 'asset_tag' => link_to('hardware/'.$asset->id.'/view', $asset->asset_tag), 'serial' => $asset->serial, 'assigned_to' => ($asset->assigned_to) ? link_to('/admin/users/'.$asset->assigned_to.'/view', $asset->assigneduser->fullName()) : '', - 'actions' => $actions - ); + 'actions' => $actions, + 'companyName' => Company::getName($asset) + ); } $data = array('total' => $assetsCount, 'rows' => $rows); diff --git a/app/models/Company.php b/app/models/Company.php index 8d1bdef723..d0dd7af435 100644 --- a/app/models/Company.php +++ b/app/models/Company.php @@ -108,7 +108,7 @@ final class Company extends Elegant { $company = $companayable->company; - if (is_null($company)) { return ''; } - else { return $company->name; } + if (is_null($company)) { return ''; } + else { return e($company->name); } } } diff --git a/app/views/backend/categories/view.blade.php b/app/views/backend/categories/view.blade.php index 4c30c4658a..f196ea0c1a 100644 --- a/app/views/backend/categories/view.blade.php +++ b/app/views/backend/categories/view.blade.php @@ -42,6 +42,9 @@ data-cookie-id-table="categoryAssetsTable"> + + @lang('admin/companies/table.title') + @lang('general.id') @lang('general.name') @lang('admin/hardware/form.model') diff --git a/app/views/backend/manufacturers/view.blade.php b/app/views/backend/manufacturers/view.blade.php index bb143c07eb..b3eda974da 100644 --- a/app/views/backend/manufacturers/view.blade.php +++ b/app/views/backend/manufacturers/view.blade.php @@ -44,6 +44,9 @@ data-cookie-id-table="maufacturerAssetsTableOIUOIUI"> + + @lang('admin/companies/table.title') + @lang('general.id') @lang('general.name') @lang('admin/hardware/form.model') diff --git a/app/views/backend/models/view.blade.php b/app/views/backend/models/view.blade.php index 6c6af0ee7b..29addc981e 100755 --- a/app/views/backend/models/view.blade.php +++ b/app/views/backend/models/view.blade.php @@ -62,6 +62,7 @@ + {{{ Lang::get('admin/companies/table.title') }}} {{Lang::get('general.id')}} {{Lang::get('general.name')}} {{Lang::get('general.asset_tag')}}