From 86ae76d8853f6fa839133047b057649f208455ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Mon, 15 Feb 2021 10:11:44 +0300
Subject: [PATCH] fixed permission check issue

---
 .../documents/index/empty-page.blade.php         | 10 ++++++----
 .../documents/index/top-buttons.blade.php        | 16 ++++++++++------
 resources/views/components/empty-page.blade.php  | 10 ++++++----
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/resources/views/components/documents/index/empty-page.blade.php b/resources/views/components/documents/index/empty-page.blade.php
index 81961f829..e281731a4 100644
--- a/resources/views/components/documents/index/empty-page.blade.php
+++ b/resources/views/components/documents/index/empty-page.blade.php
@@ -10,14 +10,16 @@
                 {!! trans($textEmptyPage) !!} {!! trans('general.empty.documentation', ['url' => $urlDocsPath]) !!}
             </p>
 
-            @if ($checkPermissionCreate) 
+            @if ($checkPermissionCreate)
                 @can($permissionCreate)
-            @endif
+                    <a href="{{ route($createRoute) }}" class="btn btn-success float-right mt-4">
+                        <span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice($textPage, 1)]) }}</span>
+                    </a>
+                @endcan
+            @else
                 <a href="{{ route($createRoute) }}" class="btn btn-success float-right mt-4">
                     <span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice($textPage, 1)]) }}</span>
                 </a>
-            @if ($checkPermissionCreate)
-                @endcan
             @endif
         </div>
     </div>
diff --git a/resources/views/components/documents/index/top-buttons.blade.php b/resources/views/components/documents/index/top-buttons.blade.php
index 6108f4856..001540f81 100644
--- a/resources/views/components/documents/index/top-buttons.blade.php
+++ b/resources/views/components/documents/index/top-buttons.blade.php
@@ -1,17 +1,21 @@
-@if ($checkPermissionCreate) 
+@if ($checkPermissionCreate)
     @can($permissionCreate)
-@endif
+        @if (!$hideCreate)
+            <a href="{{ route($createRoute) }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
+        @endif
 
-    @if (!$hideCreate) 
+        @if (!$hideImport)
+            <a href="{{ route($importRoute, $importRouteParameters) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
+        @endif
+    @endcan
+@else
+    @if (!$hideCreate)
         <a href="{{ route($createRoute) }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
     @endif
 
     @if (!$hideImport)
         <a href="{{ route($importRoute, $importRouteParameters) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
     @endif
-
-@if ($checkPermissionCreate)
-    @endcan
 @endif
 
 @if (!$hideExport)
diff --git a/resources/views/components/empty-page.blade.php b/resources/views/components/empty-page.blade.php
index d02fd9d15..8dc333682 100644
--- a/resources/views/components/empty-page.blade.php
+++ b/resources/views/components/empty-page.blade.php
@@ -10,14 +10,16 @@
                 {!! trans($textEmptyPage) !!} {!! trans('general.empty.documentation', ['url' => $urlDocsPath]) !!}
             </p>
 
-            @if ($checkPermissionCreate) 
+            @if ($checkPermissionCreate)
                 @can($permissionCreate)
-            @endif
+                    <a href="{{ route($routeCreate) }}" class="btn btn-success float-right mt-4">
+                        <span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice($textPage, 1)]) }}</span>
+                    </a>
+                @endcan
+            @else
                 <a href="{{ route($routeCreate) }}" class="btn btn-success float-right mt-4">
                     <span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice($textPage, 1)]) }}</span>
                 </a>
-            @if ($checkPermissionCreate)
-                @endcan
             @endif
         </div>
     </div>