diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 663feffccf..c08d1d7058 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -915,10 +915,9 @@ class AssetsController extends AdminController $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($assets) { if ($assets->deleted_at=='') { - return ' '; - } elseif ($asset->model->deleted_at!='') { - return ''; - + return ' '; + } elseif ($assets->model->deleted_at=='') { + return ''; } }); diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index 07c5099878..187ecb7726 100644 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -268,7 +268,7 @@
  •  
  • @lang('general.asset_models')
  • @lang('general.categories')
  • -
  • @lang('general.deleted')
  • +
  • @lang('general.deleted')