From 2aad0bb11afe9636937499d0728b95c9a8ec4d66 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 3 Jun 2021 12:55:54 +0300 Subject: [PATCH 1/5] #4092 missing images and icons on first install --- composer.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 6ea064e89..b6c905bd8 100644 --- a/composer.json +++ b/composer.json @@ -92,8 +92,7 @@ "filp/whoops": "~2.0", "fzaninotto/faker": "~1.4", "symfony/css-selector": "3.1.*", - "symfony/dom-crawler": "3.1.*", - "anomaly/installer-module": "~2.4.0" + "symfony/dom-crawler": "3.1.*" }, "repositories": [ { @@ -112,7 +111,7 @@ "psr-4": { "App\\": "app/", "Database\\Factories\\": "database/factories/", - "Database\\Seeders\\": "database/seeders/" + "Database\\Seeders\\": "database/seeder/" } }, "autoload-dev": { From 74aeb6b0034dce772ab2d1dccc525cd5f36f22e3 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 4 Jun 2021 12:08:19 +0300 Subject: [PATCH 2/5] #4092 missing images and icons on first install --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b6c905bd8..4c71fce37 100644 --- a/composer.json +++ b/composer.json @@ -92,7 +92,8 @@ "filp/whoops": "~2.0", "fzaninotto/faker": "~1.4", "symfony/css-selector": "3.1.*", - "symfony/dom-crawler": "3.1.*" + "symfony/dom-crawler": "3.1.*", + "anomaly/installer-module": "~2.4.0" }, "repositories": [ { From 05425b810b356dd1cc9abde70d775a4a87aa2164 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Mon, 7 Jun 2021 10:55:54 +0300 Subject: [PATCH 3/5] add twig function for check installed module --- .../default/visiosoft/advs-module/src/AdvsModulePlugin.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php index 162329dc5..4c07c89ac 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php @@ -115,6 +115,12 @@ class AdvsModulePlugin extends Plugin ); } ), + new \Twig_SimpleFunction( + 'is_module_installed', + function ($moduleNamespace) { + return is_module_installed($moduleNamespace); + } + ) ]; } From 2d554ff3542322402fb5822045a73cf9380ca30a Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Mon, 7 Jun 2021 18:03:54 +0300 Subject: [PATCH 4/5] is_installed function fixed for twig --- .../default/visiosoft/advs-module/src/AdvsModulePlugin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php index 4c07c89ac..0a1bcc3e3 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php @@ -116,9 +116,9 @@ class AdvsModulePlugin extends Plugin } ), new \Twig_SimpleFunction( - 'is_module_installed', - function ($moduleNamespace) { - return is_module_installed($moduleNamespace); + 'is_module_enabled', + function ($slug) { + return app(AdvModel::class)->is_enabled($slug); } ) ]; From 9b7f48fad7fc659b8837ebf42153941ac3890f9f Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 8 Jun 2021 14:53:00 +0300 Subject: [PATCH 5/5] fixed composer.json --- composer.json | 2 +- database/{seeder => seeders}/DatabaseSeeder.php | 0 database/{seeder => seeders}/GridSeeder.php | 0 database/{seeder => seeders}/WidgetSeeder.php | 0 database/{seeder => seeders}/settings.sql | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename database/{seeder => seeders}/DatabaseSeeder.php (100%) rename database/{seeder => seeders}/GridSeeder.php (100%) rename database/{seeder => seeders}/WidgetSeeder.php (100%) rename database/{seeder => seeders}/settings.sql (100%) diff --git a/composer.json b/composer.json index 4c71fce37..6ea064e89 100644 --- a/composer.json +++ b/composer.json @@ -112,7 +112,7 @@ "psr-4": { "App\\": "app/", "Database\\Factories\\": "database/factories/", - "Database\\Seeders\\": "database/seeder/" + "Database\\Seeders\\": "database/seeders/" } }, "autoload-dev": { diff --git a/database/seeder/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php similarity index 100% rename from database/seeder/DatabaseSeeder.php rename to database/seeders/DatabaseSeeder.php diff --git a/database/seeder/GridSeeder.php b/database/seeders/GridSeeder.php similarity index 100% rename from database/seeder/GridSeeder.php rename to database/seeders/GridSeeder.php diff --git a/database/seeder/WidgetSeeder.php b/database/seeders/WidgetSeeder.php similarity index 100% rename from database/seeder/WidgetSeeder.php rename to database/seeders/WidgetSeeder.php diff --git a/database/seeder/settings.sql b/database/seeders/settings.sql similarity index 100% rename from database/seeder/settings.sql rename to database/seeders/settings.sql