From 94af6de8c1352ba97598aeeb80c7e89aed29cf97 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Thu, 26 Mar 2020 13:53:30 +0300
Subject: [PATCH] #1008 If user role editor can't edit ads #297

---
 .../resources/views/ad-detail/partials/dropleft-edit.twig     | 2 +-
 .../advs-module/src/Http/Controller/advsController.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/dropleft-edit.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/dropleft-edit.twig
index 76d7038de..f8363133d 100644
--- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/dropleft-edit.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/dropleft-edit.twig
@@ -1,4 +1,4 @@
-{% if app.auth.id == adv.created_by_id %}
+{% if auth_user().id == adv.created_by_id or auth_user().hasPermission('visiosoft.module.advs::advs.write') %}
     <div class="btn-group dropleft dropleft-edit position-fixed">
         <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             {{ trans('visiosoft.module.advs::field.ad_actions') }}
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
index f82c17863..88ac83ac0 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -642,8 +642,8 @@ class AdvsController extends PublicController
         $isActive = new AdvModel();
         $adv = $advRepository->getAdvArray($id);
 
-
-        if ($adv['created_by_id'] != Auth::id() && !Auth::user()->hasRole('admin')) {
+        if ($adv['created_by_id'] != auth()->id()
+            && !auth()->user()->hasPermission('visiosoft.module.advs::advs.write')) {
             abort(403);
         }
         $cats_d = array();