From e0357d00035ead0b049f458c754659778c016e23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Tue, 27 Sep 2016 21:48:06 +0200
Subject: [PATCH] FEATURE: fix redirecting after edit to be more logical

---
 app/Http/Controllers/Admin/Contents/EditContent.php   | 2 +-
 app/Http/Controllers/Admin/Users/EditUser.php         | 2 +-
 resources/views/admin/userManagement/detail.blade.php | 5 +++++
 resources/views/admin/userManagement/edit.blade.php   | 5 +++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/Contents/EditContent.php b/app/Http/Controllers/Admin/Contents/EditContent.php
index 9e5cbe59..f0db70e7 100644
--- a/app/Http/Controllers/Admin/Contents/EditContent.php
+++ b/app/Http/Controllers/Admin/Contents/EditContent.php
@@ -189,7 +189,7 @@ class EditContent extends Controller
 
         // something was changed, inform user
         return redirect()
-            ->route('content.edit', ['id' => $page->id])
+            ->route('content.overview')
             ->with('success', trans('admin/contents.successfullyEdited'));
     }
 
diff --git a/app/Http/Controllers/Admin/Users/EditUser.php b/app/Http/Controllers/Admin/Users/EditUser.php
index 71aff98b..c64521f6 100644
--- a/app/Http/Controllers/Admin/Users/EditUser.php
+++ b/app/Http/Controllers/Admin/Users/EditUser.php
@@ -83,7 +83,7 @@ class EditUser extends Controller
         Event::fire(new EditUserEvent($user));
 
         return redirect()
-            ->route('users.detail', ['id' => $id])
+            ->back()
             ->with('success', trans('admin/userManagement.userSuccessfullyEdited'));
     }
 }
\ No newline at end of file
diff --git a/resources/views/admin/userManagement/detail.blade.php b/resources/views/admin/userManagement/detail.blade.php
index fe2eca6d..0a8cc60c 100644
--- a/resources/views/admin/userManagement/detail.blade.php
+++ b/resources/views/admin/userManagement/detail.blade.php
@@ -2,6 +2,11 @@
 
 @section('pageHeading', trans('admin/userManagement.profile'))
 @section('pageDescription', @trans('admin/userManagement.detail', ['name' => $user->name, 'email' => $user->email]))
+@section('headerButtons')
+    <a href="{{route('users.overview')}}" class="btn btn-secondary btn-sm rounded" title="@lang('admin/userManagement.overview')">
+        <i class="fa fa-list"></i>
+    </a>
+@endsection
 
 @section('content')
 
diff --git a/resources/views/admin/userManagement/edit.blade.php b/resources/views/admin/userManagement/edit.blade.php
index aed103e4..a1240547 100644
--- a/resources/views/admin/userManagement/edit.blade.php
+++ b/resources/views/admin/userManagement/edit.blade.php
@@ -1,6 +1,11 @@
 @extends('admin.layoutWithNavigation')
 
 @section('pageHeading', @trans('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email]))
+@section('headerButtons')
+    <a href="{{route('users.overview')}}" class="btn btn-secondary btn-sm rounded" title="@lang('admin/userManagement.overview')">
+        <i class="fa fa-list"></i>
+    </a>
+@endsection
 
 @section('content')
     <div class="row">