From f6d762ba4679e77edaa9b4399781d0d7f49884f7 Mon Sep 17 00:00:00 2001 From: victor Date: Tue, 28 Jul 2020 13:21:22 +0200 Subject: [PATCH] Revert "Added no match found on live search" This reverts commit 47a07c61 --- skolehjem/app/Http/Controllers/ContactController.php | 5 ----- skolehjem/app/Http/Controllers/EventController.php | 8 -------- skolehjem/app/Http/Controllers/MenuPlanController.php | 10 ---------- skolehjem/app/Http/Controllers/RolesController.php | 7 ------- skolehjem/app/Http/Controllers/UserController.php | 10 ---------- .../resources/views/admin/contacts/index.blade.php | 9 ++++++++- skolehjem/resources/views/admin/users/index.blade.php | 3 +-- 7 files changed, 9 insertions(+), 43 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 345c17c..727203b 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -171,11 +171,6 @@ class ContactController extends Controller }else{ $output.=''. 'Din søgning matchede ikke nogen personer'. - ''. - ''. - ''. - ''. - ''. ''; } return Response($output); diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 8763e1d..f487688 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -167,14 +167,6 @@ class EventController extends Controller ''. ''; } - }else{ - $output.=''. - 'Din søgning matchede ikke nogen personer'. - ''. - ''. - ''. - ''. - ''; } return Response($output); } diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 7ef8090..279bf1c 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -164,16 +164,6 @@ class MenuPlanController extends Controller ''. ''; } - }else{ - $output.=''. - 'Din søgning matchede ikke nogen personer'. - ''. - ''. - ''. - ''. - ''. - ''. - ''; } return Response($output); } diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 777447c..801a275 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -143,13 +143,6 @@ class rolesController extends Controller ''. ''; } - }else{ - $output.=''. - 'Din søgning matchede ikke nogen resultater'. - ''. - ''. - ''. - ''; } return Response($output); } diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 07ae942..8578c94 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -329,16 +329,6 @@ class UserController extends Controller ''. ''; } - }else{ - $output.=''. - 'Din søgning matchede ikke nogen personer'. - ''. - ''. - ''. - ''. - ''. - ''. - ''; } return Response($output); } diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index 04442cd..03328db 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -56,7 +56,14 @@ url: '{{route('contacts.search')}}', data: {'search':$value}, success:function (data) { - $('tbody').html(data); + if(data == $value){ + $('tbody').html(data); + $("p").hide(); + }else{ + $("p").show(); + $("p").html("Det er ingen data der matcher din søgning."); + } + }, error:function (data) { console.log(data); diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index 901f92d..5c761c2 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -17,7 +17,7 @@
@csrf - +
@@ -46,7 +46,6 @@ {{$user->roles[$i]->name}} @endif @endfor - $user->id ]) }}">Update
$user ]) }}" class="w-100 nostyle">