From 55bb0d85aac37a05dbe23cec5c40635d96e12d4d Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 19 Jun 2020 15:02:39 +0300 Subject: [PATCH 1/2] #1611 Delete installer error --- .../defaultadmin-theme/resources/js/theme/alert.js | 9 +++++++++ .../resources/views/partials/metadata.twig | 1 + 2 files changed, 10 insertions(+) create mode 100644 addons/default/visiosoft/defaultadmin-theme/resources/js/theme/alert.js diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/js/theme/alert.js b/addons/default/visiosoft/defaultadmin-theme/resources/js/theme/alert.js new file mode 100644 index 000000000..2ac9620c0 --- /dev/null +++ b/addons/default/visiosoft/defaultadmin-theme/resources/js/theme/alert.js @@ -0,0 +1,9 @@ +var onAlertLinkClick = function () { + $('.alert a').click(function (e) { + e.stopPropagation() + }) +}; + +$(document).ready(function () { + onAlertLinkClick(); +}); \ No newline at end of file diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/metadata.twig index 73442b46c..aaf7aa187 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/metadata.twig +++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/metadata.twig @@ -55,6 +55,7 @@ {{ asset_add("scripts.js", "visiosoft.theme.defaultadmin::js/theme/push.js") }} {{ asset_add("scripts.js", "visiosoft.theme.defaultadmin::js/theme/search.js") }} {{ asset_add("scripts.js", "visiosoft.theme.defaultadmin::js/theme/select2.js") }} +{{ asset_add("scripts.js", "visiosoft.theme.defaultadmin::js/theme/alert.js") }} {{ asset_add("theme.js", "visiosoft.theme.base::js/jquery.maskedinput.js") }} {{ asset_add("theme.js", "visiosoft.theme.base::js/intlTelInput.min.js") }} {{ asset_add("theme.js", "visiosoft.theme.base::js/utils.js") }} From 9db07e43fddb6fba57ffc00c60784e3cdee7440f Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 22 Jun 2020 10:58:36 +0300 Subject: [PATCH 2/2] =?UTF-8?q?#1704=20dogalavm=20paketler=20mod=C3=BCl?= =?UTF-8?q?=C3=BC=20uyar=C4=B1=20sorunu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php index 226a03c01..ede3c3c13 100644 --- a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php +++ b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php @@ -30,8 +30,7 @@ class UsersFieldsSeeder extends Seeder { $namespace = 'users'; $locked = 0; - $stream = $streamRepository->findBy('slug', 'users'); - $assignmentConfig = 'a:0:{}'; + $stream = $streamRepository->findBySlugAndNamespace('users', 'users'); $customFields = [ 0 => [