From 1db1819a56f53ff8df1ea6f0b7c4f6195d397d2a Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 10 Feb 2015 16:06:33 -0800 Subject: [PATCH] Added Archived as view for filter --- app/controllers/admin/AssetsController.php | 2 ++ app/database/seeds/StatuslabelsSeeder.php | 12 ++++++++++++ app/views/backend/layouts/default.blade.php | 1 + 3 files changed, 15 insertions(+) diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 6c2474dd21..32df7dce2a 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -46,6 +46,8 @@ class AssetsController extends AdminController $assets->RTD(); } elseif (Input::get('Undeployable')) { $assets->Undeployable(); + } elseif (Input::get('Archived')) { + $assets->Archived(); } elseif (Input::get('Deployed')) { $assets->Deployed(); } diff --git a/app/database/seeds/StatuslabelsSeeder.php b/app/database/seeds/StatuslabelsSeeder.php index 6531b778dc..5ec3bf2cd8 100755 --- a/app/database/seeds/StatuslabelsSeeder.php +++ b/app/database/seeds/StatuslabelsSeeder.php @@ -34,6 +34,18 @@ class StatuslabelsSeeder extends Seeder 'notes' => '' ); + $status[] = array( + 'name' => 'Archived', + 'created_at' => $date->modify('-10 day'), + 'updated_at' => $date->modify('-3 day'), + 'user_id' => 1, + 'deleted_at' => NULL, + 'deployable' => 0, + 'pending' => 0, + 'archived' => 1, + 'notes' => 'These assets are permanently undeployable' + ); + $status[] = array( 'name' => 'Out for Diagnostics', diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index fb79abd560..81bbfd3fdd 100644 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -242,6 +242,7 @@
  • @lang('general.pending')
  • @lang('general.undeployable')
  • @lang('general.list_all')
  • +
  • @lang('admin/hardware/general.archived')
  •  
  • @lang('general.asset_models')
  • @lang('general.categories')