From cdddbcf695165700e9a30de8777b75bb25a99bc8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 12 Dec 2013 00:50:56 -0500
Subject: [PATCH] Using URL::previous to determine back button address

---
 app/views/backend/categories/edit.blade.php    |  4 ++--
 app/views/backend/depreciations/edit.blade.php |  4 ++--
 app/views/backend/groups/create.blade.php      |  4 ++--
 app/views/backend/groups/edit.blade.php        |  2 +-
 app/views/backend/hardware/checkin.blade.php   |  8 ++------
 app/views/backend/hardware/checkout.blade.php  |  8 ++------
 app/views/backend/hardware/clone.blade.php     |  4 ++--
 app/views/backend/hardware/edit.blade.php      | 13 ++-----------
 app/views/backend/licenses/checkin.blade.php   |  2 +-
 app/views/backend/licenses/checkout.blade.php  |  2 +-
 app/views/backend/licenses/edit.blade.php      | 14 +++-----------
 app/views/backend/locations/edit.blade.php     |  4 ++--
 app/views/backend/manufacturers/edit.blade.php |  4 ++--
 app/views/backend/models/edit.blade.php        |  4 ++--
 app/views/backend/settings/edit.blade.php      |  4 ++--
 app/views/backend/statuslabels/edit.blade.php  |  4 ++--
 16 files changed, 30 insertions(+), 55 deletions(-)

diff --git a/app/views/backend/categories/edit.blade.php b/app/views/backend/categories/edit.blade.php
index 63c9ec126d..8fa1de7800 100755
--- a/app/views/backend/categories/edit.blade.php
+++ b/app/views/backend/categories/edit.blade.php
@@ -16,7 +16,7 @@
 
 <div class="row header">
     <div class="col-md-12">
-    	<a href="{{ route('categories') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+    	<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		<h3>Asset Categories</h3>
 	</div>
 </div>
@@ -42,7 +42,7 @@
 						<div class="form-group">
 						<label class="col-md-2 control-label"></label>
 							<div class="col-md-7">
-								<a class="btn btn-link" href="{{ route('categories') }}">@lang('general.cancel')</a>
+								<a class="btn btn-link" href="{{ URL::previous() }}">@lang('general.cancel')</a>
 								<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 							</div>
 						</div>
diff --git a/app/views/backend/depreciations/edit.blade.php b/app/views/backend/depreciations/edit.blade.php
index 826bb273dd..752b9c0967 100755
--- a/app/views/backend/depreciations/edit.blade.php
+++ b/app/views/backend/depreciations/edit.blade.php
@@ -17,7 +17,7 @@
 
 <div class="row header">
     <div class="col-md-12">
-    	<a href="{{ route('depreciations') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+    	<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		<h3>
 		@if ($depreciation->id)
 			Update Depreciation
@@ -55,7 +55,7 @@
 			<div class="form-group">
 			<label class="col-md-4 control-label"></label>
 				<div class="col-md-7">
-					<a class="btn btn-link" href="{{ route('depreciations') }}">@lang('general.cancel')</a>
+					<a class="btn btn-link" href="{{ URL::previous() }}">@lang('general.cancel')</a>
 					<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 				</div>
 			</div>
diff --git a/app/views/backend/groups/create.blade.php b/app/views/backend/groups/create.blade.php
index 1db2dddfda..48b3c0c6f4 100755
--- a/app/views/backend/groups/create.blade.php
+++ b/app/views/backend/groups/create.blade.php
@@ -12,7 +12,7 @@ Create Group ::
 
 <div class="row header">
     <div class="col-md-12">
-			<a href="{{ route('groups') }}" class="btn btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+			<a href="{{ URL::previous() }}" class="btn btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		<h3>Group Update</h3>
 	</div>
 </div>
@@ -66,7 +66,7 @@ Create Group ::
 				<div class="form-group">
 				<label class="col-md-2 control-label"></label>
 					<div class="col-md-7">
-						<a class="btn btn-link" href="{{ route('groups') }}">@lang('general.cancel')</a>
+						<a class="btn btn-link" href="{{ URL::previous() }}">@lang('general.cancel')</a>
 						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 					</div>
 				</div>
diff --git a/app/views/backend/groups/edit.blade.php b/app/views/backend/groups/edit.blade.php
index bc89d6c746..05b2707860 100755
--- a/app/views/backend/groups/edit.blade.php
+++ b/app/views/backend/groups/edit.blade.php
@@ -12,7 +12,7 @@ Group Update ::
 
 <div class="row header">
     <div class="col-md-12">
-			<a href="{{ route('groups') }}" class="btn btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+			<a href="{{ URL::previous() }}" class="btn btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		<h3>Group Update</h3>
 	</div>
 </div>
diff --git a/app/views/backend/hardware/checkin.blade.php b/app/views/backend/hardware/checkin.blade.php
index 687bfc6d63..fc627f9484 100644
--- a/app/views/backend/hardware/checkin.blade.php
+++ b/app/views/backend/hardware/checkin.blade.php
@@ -15,7 +15,7 @@
 
 <div class="row header">
     <div class="col-md-12">
-		<a href="{{ route('hardware') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		<h3> Checkin Asset </h3>
 	</div>
 </div>
@@ -55,11 +55,7 @@
 				<div class="form-group">
 				<label class="col-md-2 control-label"></label>
 					<div class="col-md-7">
-						@if ($asset->id)
-						<a class="btn btn-link" href="{{ route('view/hardware', $asset->id) }}">@lang('general.cancel')</a>
-						@else
-						<a class="btn btn-link" href="{{ route('hardware') }}">Cancel</a>
-						@endif
+						<a class="btn btn-link" href="{{ URL::previous() }}">@lang('general.cancel')</a>
 						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i>@lang('general.checkin')</button>
 					</div>
 				</div>
diff --git a/app/views/backend/hardware/checkout.blade.php b/app/views/backend/hardware/checkout.blade.php
index e4bad4cf21..2057d333d1 100644
--- a/app/views/backend/hardware/checkout.blade.php
+++ b/app/views/backend/hardware/checkout.blade.php
@@ -15,7 +15,7 @@
 
 <div class="row header">
     <div class="col-md-12">
-		<a href="{{ route('hardware') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		<h3>
 		@if ($asset->id)
 			Checkout Asset to User
@@ -72,11 +72,7 @@
 			<div class="form-group">
 			<label class="col-md-2 control-label"></label>
 				<div class="col-md-7">
-					@if ($asset->id)
-					<a class="btn btn-link" href="{{ route('view/hardware', $asset->id) }}">Cancel</a>
-					@else
-					<a class="btn btn-link" href="{{ route('hardware') }}">Cancel</a>
-					@endif
+					<a class="btn btn-link" href="{{ URL::previous() }}">Cancel</a>
 					<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> Save</button>
 				</div>
 			</div>
diff --git a/app/views/backend/hardware/clone.blade.php b/app/views/backend/hardware/clone.blade.php
index 93dc1d4c68..fc7fb12f76 100644
--- a/app/views/backend/hardware/clone.blade.php
+++ b/app/views/backend/hardware/clone.blade.php
@@ -11,7 +11,7 @@
 <div class="page-header">
 
 		<div class="pull-right">
-			<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+			<a href="{{ URL::previous() }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		</div>
 
 		<h3>Clone Asset</h3>
@@ -133,7 +133,7 @@
 	<!-- Form actions -->
 	<div class="form-group">
 		<div class="controls">
-			<a class="btn btn-link" href="{{ route('hardware') }}">Cancel</a>
+			<a class="btn btn-link" href="{{ URL::previous() }}">Cancel</a>
 			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> Save</button>
 		</div>
 	</div>
diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php
index 26e210ba75..be6e770de4 100755
--- a/app/views/backend/hardware/edit.blade.php
+++ b/app/views/backend/hardware/edit.blade.php
@@ -16,12 +16,7 @@
 
 <div class="row header">
     <div class="col-md-12">
-    	@if ($asset->id)
-			<a href="{{ route('view/hardware',$asset->id) }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		@else
-			<a href="{{ route('hardware') }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		@endif
-
+			<a href="{{ URL::previous() }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		<h3>
 		@if ($asset->id)
 		Asset Update
@@ -139,11 +134,7 @@
 				<div class="form-group">
 				<label class="col-md-2 control-label"></label>
 					<div class="col-md-7">
-						@if ($asset->id)
-						<a class="btn btn-link" href="{{ route('view/hardware', $asset->id) }}">Cancel</a>
-						@else
-						<a class="btn btn-link" href="{{ route('hardware') }}">Cancel</a>
-						@endif
+						<a class="btn btn-link" href="{{ URL::previous() }}">Cancel</a>
 						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> Save</button>
 					</div>
 				</div>
diff --git a/app/views/backend/licenses/checkin.blade.php b/app/views/backend/licenses/checkin.blade.php
index 9092106edb..2db72d4d7e 100644
--- a/app/views/backend/licenses/checkin.blade.php
+++ b/app/views/backend/licenses/checkin.blade.php
@@ -11,7 +11,7 @@
 
 <div class="row header">
     <div class="col-md-12">
-		<a href="{{ route('licenses') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		<h3> Checkin License </h3>
 	</div>
 </div>
diff --git a/app/views/backend/licenses/checkout.blade.php b/app/views/backend/licenses/checkout.blade.php
index f60f293646..7195dcff49 100644
--- a/app/views/backend/licenses/checkout.blade.php
+++ b/app/views/backend/licenses/checkout.blade.php
@@ -11,7 +11,7 @@
 
 <div class="row header">
     <div class="col-md-12">
-		<a href="{{ route('hardware') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		<h3>
 			Checkout License to User
 		</h3>
diff --git a/app/views/backend/licenses/edit.blade.php b/app/views/backend/licenses/edit.blade.php
index 235662b859..cd34810c92 100755
--- a/app/views/backend/licenses/edit.blade.php
+++ b/app/views/backend/licenses/edit.blade.php
@@ -15,12 +15,7 @@
 
 <div class="row header">
     <div class="col-md-12">
-    	@if ($license->id)
-			<a href="{{ route('view/license',$license->id) }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		@else
-			<a href="{{ route('licenses') }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		@endif
-
+			<a href="{{ URL::previous() }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		<h3>
 		@if ($license->id)
 			Update License
@@ -130,11 +125,8 @@
 				<div class="form-group">
 				<label class="col-md-3 control-label"></label>
 					<div class="col-md-7">
-						@if ($license->id)
-						<a class="btn btn-link" href="{{ route('view/license', $license->id) }}">Cancel</a>
-						@else
-						<a class="btn btn-link" href="{{ route('licenses') }}">Cancel</a>
-						@endif
+
+						<a class="btn btn-link" href="{{ URL::previous() }}">Cancel</a>
 						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> Save</button>
 					</div>
 				</div>
diff --git a/app/views/backend/locations/edit.blade.php b/app/views/backend/locations/edit.blade.php
index 513a98b1fd..dead07de48 100755
--- a/app/views/backend/locations/edit.blade.php
+++ b/app/views/backend/locations/edit.blade.php
@@ -17,7 +17,7 @@
 
 <div class="row header">
     <div class="col-md-12">
-    	<a href="{{ route('locations') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+    	<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		<h3>
 		@if ($location->id)
 			Update Location
@@ -115,7 +115,7 @@
 			<div class="form-group">
 			<label class="col-md-2 control-label"></label>
 				<div class="col-md-7">
-					<a class="btn btn-link" href="{{ route('locations') }}">@lang('general.cancel')</a>
+					<a class="btn btn-link" href="{{ URL::previous() }}">@lang('general.cancel')</a>
 					<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 				</div>
 			</div>
diff --git a/app/views/backend/manufacturers/edit.blade.php b/app/views/backend/manufacturers/edit.blade.php
index 2ea00f0277..4234d43ebc 100755
--- a/app/views/backend/manufacturers/edit.blade.php
+++ b/app/views/backend/manufacturers/edit.blade.php
@@ -15,7 +15,7 @@
 
 <div class="row header">
     <div class="col-md-12">
-    	<a href="{{ route('manufacturers') }}" class="btn-flat gray pull-right"><i class="icon-plus-sign icon-white"></i> Back</a>
+    	<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-plus-sign icon-white"></i> Back</a>
 		<h3>
 		@if ($manufacturer->id)
 		Update Manufacturer
@@ -52,7 +52,7 @@
 		<label class="col-md-2 control-label"></label>
 			<div class="col-md-7">
 				@if ($manufacturer->id)
-				<a class="btn btn-link" href="{{ route('view/manufacturer', $manufacturer->id) }}">@lang('general.cancel')</a>
+				<a class="btn btn-link" href="{{ URL::previous() }}">@lang('general.cancel')</a>
 				@else
 				<a class="btn btn-link" href="{{ route('manufacturers') }}">@lang('general.cancel')</a>
 				@endif
diff --git a/app/views/backend/models/edit.blade.php b/app/views/backend/models/edit.blade.php
index 237e19d1d7..b87158a8b3 100755
--- a/app/views/backend/models/edit.blade.php
+++ b/app/views/backend/models/edit.blade.php
@@ -14,7 +14,7 @@
 @section('content')
 <div class="row header">
     <div class="col-md-12">
-    		<a href="{{ route('models') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+    		<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		<h3>
 		@if ($model->id)
 		Update Model
@@ -95,7 +95,7 @@
 			<div class="form-group">
 			<label class="col-md-2 control-label"></label>
 				<div class="col-md-7">
-					<a class="btn btn-link" href="{{ route('models') }}">Cancel</a>
+					<a class="btn btn-link" href="{{ URL::previous() }}">Cancel</a>
 					<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 				</div>
 			</div>
diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php
index daaf6d2612..fbdaeaa443 100755
--- a/app/views/backend/settings/edit.blade.php
+++ b/app/views/backend/settings/edit.blade.php
@@ -12,7 +12,7 @@
                 <!-- header -->
 
                 <div class="pull-right">
-					<a href="{{ route('app') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+					<a href="{{ URL::previous() }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 				</div>
 
 				<h3 class="name">Update Settings</h3>
@@ -53,7 +53,7 @@
 								<!-- Form actions -->
 									<div class="form-group">
 										<div class="controls">
-											<a class="btn btn-link" href="{{ route('app') }}">@lang('general.cancel')</a>
+											<a class="btn btn-link" href="{{ URL::previous() }}">@lang('general.cancel')</a>
 											<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 										</div>
 								</div>
diff --git a/app/views/backend/statuslabels/edit.blade.php b/app/views/backend/statuslabels/edit.blade.php
index b96f5fab7d..dabf60aec4 100755
--- a/app/views/backend/statuslabels/edit.blade.php
+++ b/app/views/backend/statuslabels/edit.blade.php
@@ -15,7 +15,7 @@
 
 <div class="row header">
     <div class="col-md-12">
-    	<a href="{{ route('statuslabels') }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+    	<a href="{{ URL::previous() }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		<h3>Status Labels</h3>
 	</div>
 </div>
@@ -45,7 +45,7 @@
 				<div class="form-group">
 				<label class="col-md-2 control-label"></label>
 					<div class="col-md-7">
-						<a class="btn btn-link" href="{{ route('statuslabels') }}">Cancel</a>
+						<a class="btn btn-link" href="{{ URL::previous() }}">Cancel</a>
 						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 					</div>
 				</div>