From bb88b85a02041e4cfc58358461d3e2e8455a82f9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 11 Jan 2016 18:48:49 -0800
Subject: [PATCH] Removed erroneous blade that led to confusing UX

---
 app/config/version.php                        |  2 +-
 app/controllers/admin/AssetsController.php    |  2 +-
 .../backend/hardware/import-status.blade.php  | 23 -------------------
 3 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 app/views/backend/hardware/import-status.blade.php

diff --git a/app/config/version.php b/app/config/version.php
index a52b9d121c..4632ec2d79 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
   'app_version' => 'v2.1.0-pre',
-  'hash_version' => 'v2.1.0-pre-22-g9800786',
+  'hash_version' => 'v2.1.0-pre-24-g4037200',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index aa5bcb90b5..2dbac3c584 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -842,7 +842,7 @@ class AssetsController extends AdminController
         file_put_contents($file, $display_output);
 
 
-        return View::make('backend/hardware/import-status');
+        return Redirect::to('hardware')->with('success','Your file has been imported');
 
     }
 
diff --git a/app/views/backend/hardware/import-status.blade.php b/app/views/backend/hardware/import-status.blade.php
deleted file mode 100644
index 6a94d4dbf5..0000000000
--- a/app/views/backend/hardware/import-status.blade.php
+++ /dev/null
@@ -1,23 +0,0 @@
-@extends('backend/layouts/default')
-
-{{-- Page title --}}
-@section('title')
-     @lang('general.import') ::
-@parent
-@stop
-
-{{-- Page content --}}
-@section('content')
-
-<div class="row header">
-    <div class="col-md-12">
-        <a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="fa fa-arrow-left icon-white"></i>  @lang('general.back')</a>
-        <h3> @lang('general.import')</h3>
-    </div>
-</div>
-
-
-Your process has started.
-
-
-@stop