From f8de9a446294d810e20b78d78ddfcc0888069abf Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 24 Feb 2021 16:32:56 +0300 Subject: [PATCH 1/3] #3231 [recommendedads-module] Table buttons disappear if recommended-module is active --- .../advs-module/src/Adv/Table/AdvTableButtons.php | 11 +++++++---- .../src/Http/Controller/Admin/AdvsController.php | 9 --------- .../src/DefaultadminThemeServiceProvider.php | 9 --------- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableButtons.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableButtons.php index 52fa90443..cb7f228ce 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableButtons.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableButtons.php @@ -1,13 +1,12 @@ setButtons([ + $buttons = [ 'status' => [ 'text' => function (EntryInterface $entry) { $text_type = ($entry->getStatus() == 'approved') ? 'decline' : 'approve'; @@ -50,9 +49,13 @@ class AdvTableButtons 'create_configration' => [ 'text' => trans('visiosoft.module.advs::button.create_configurations'), 'href' => route('visiosoft.module.advs::configrations.create') . "?ad={entry.id}"] - ] + ] ] - ]); + ]; + + $builder->setButtons($buttons); + + return $buttons; } } diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php index 6962e2e4c..8ca780c9a 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php @@ -43,15 +43,6 @@ class AdvsController extends AdminController $table->addAsset("styles.css", "visiosoft.module.advs::css/custom.css"); $table->addAsset('scripts.js', 'visiosoft.module.advs::js/list.js'); - if ($this->model->is_enabled('recommendedads')) { - $table->addButton('add_recommended', [ - 'type' => 'default', - 'icon' => 'fa fa-gg', - 'text' => 'Add Recommended', - 'href' => '/admin/recommendedads/create/{entry.id}', - ]); - } - return $table->render(); } diff --git a/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php b/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php index 11f231931..17d9560e7 100644 --- a/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php +++ b/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php @@ -17,12 +17,6 @@ use Visiosoft\DefaultadminTheme\Listener\ApplySorting; */ class DefaultadminThemeServiceProvider extends AddonServiceProvider { - - /** - * The addon listeners. - * - * @var array - */ protected $listeners = [ SortNavigation::class => [ ApplySorting::class, @@ -33,9 +27,6 @@ class DefaultadminThemeServiceProvider extends AddonServiceProvider ], ]; - /** - * Register the addon. - */ public function register() { AbstractPaginator::$defaultView = 'visiosoft.theme.defaultadmin::pagination/bootstrap-4'; From b863534f490750af3d52bcaeb658eede6d2666c8 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 26 Feb 2021 16:33:35 +0300 Subject: [PATCH 2/3] #3267 emlak24 feb. issues --- .../src/Profile/Command/Authorize.php | 18 ++++++++++++++++++ .../profile-module/src/ProfileModulePlugin.php | 7 +++++++ 2 files changed, 25 insertions(+) create mode 100644 addons/default/visiosoft/profile-module/src/Profile/Command/Authorize.php diff --git a/addons/default/visiosoft/profile-module/src/Profile/Command/Authorize.php b/addons/default/visiosoft/profile-module/src/Profile/Command/Authorize.php new file mode 100644 index 000000000..9b731125c --- /dev/null +++ b/addons/default/visiosoft/profile-module/src/Profile/Command/Authorize.php @@ -0,0 +1,18 @@ +permission = $permission; + } + + public function handle(Authorizer $authorizer) + { + return $authorizer->authorize($this->permission); + } +} diff --git a/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php b/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php index e0d4ed5ef..7fc030dd4 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php @@ -3,6 +3,7 @@ use Anomaly\Streams\Platform\Addon\Plugin\Plugin; use Visiosoft\ProfileModule\Adress\Command\GetAddress; use Visiosoft\ProfileModule\Adress\Command\GetAddressByUser; +use Visiosoft\ProfileModule\Profile\Command\Authorize; use Visiosoft\ProfileModule\Profile\Command\GetProfileDetail; class ProfileModulePlugin extends Plugin @@ -45,6 +46,12 @@ class ProfileModulePlugin extends Plugin return $ad; } + ), + new \Twig_SimpleFunction( + 'authorize', + function ($permission) { + return $this->dispatch(new Authorize($permission)); + } ) ]; } From b0c794759b6cbdc1ce1e3553b703185b7e4cb74b Mon Sep 17 00:00:00 2001 From: diashalabi Date: Fri, 26 Feb 2021 19:14:15 +0300 Subject: [PATCH 3/3] #3267 emlak24 feb. issues --- .../views/new-ad/preview/preview.twig | 2 +- .../src/Profile/Command/Authorize.php | 18 ------------------ .../profile-module/src/ProfileModulePlugin.php | 7 ------- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 addons/default/visiosoft/profile-module/src/Profile/Command/Authorize.php diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig index f90ae9fb3..e0ed36c0c 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig @@ -11,7 +11,7 @@

- {% if isActive('packages') and setting_value('visiosoft.module.packages::move_the_buy_package_to_the_end') %} + {% if isActive('packages') and setting_value('visiosoft.module.packages::move_the_buy_package_to_the_end') and (auth_user().isAdmin or not auth_user().hasPermission('visiosoft.module.packages::packages.no_read')) %} {% set continueLink = url_route('visiosoft.module.packages::add_package', [adv.id]) %} {% elseif isActive('dopings') %} {% set continueLink = url_route('add_doping', [adv.id]) %} diff --git a/addons/default/visiosoft/profile-module/src/Profile/Command/Authorize.php b/addons/default/visiosoft/profile-module/src/Profile/Command/Authorize.php deleted file mode 100644 index 9b731125c..000000000 --- a/addons/default/visiosoft/profile-module/src/Profile/Command/Authorize.php +++ /dev/null @@ -1,18 +0,0 @@ -permission = $permission; - } - - public function handle(Authorizer $authorizer) - { - return $authorizer->authorize($this->permission); - } -} diff --git a/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php b/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php index 7fc030dd4..f5ea801fa 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php @@ -3,7 +3,6 @@ use Anomaly\Streams\Platform\Addon\Plugin\Plugin; use Visiosoft\ProfileModule\Adress\Command\GetAddress; use Visiosoft\ProfileModule\Adress\Command\GetAddressByUser; -use Visiosoft\ProfileModule\Profile\Command\Authorize; use Visiosoft\ProfileModule\Profile\Command\GetProfileDetail; class ProfileModulePlugin extends Plugin @@ -47,12 +46,6 @@ class ProfileModulePlugin extends Plugin return $ad; } ), - new \Twig_SimpleFunction( - 'authorize', - function ($permission) { - return $this->dispatch(new Authorize($permission)); - } - ) ]; } }