From 26cf3e84c32a0eccb6786e3e9cfa50ec3e75e441 Mon Sep 17 00:00:00 2001 From: Andras Iklody Date: Tue, 27 Apr 2021 23:54:27 +0200 Subject: [PATCH 1/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f08efb8..ea74248 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ The installation is documented at the following location [INSTALL/INSTALL.md](IN Hardware requirements: -A webserver with 4GB of memory and a single CPU core should be plenty for the current scope of Cerebrate. This might increase over the time with additional features being added, but the goal is to keep Cerebrate as lean as possible. +A webserver with 4GB of memory and a single CPU core should be plenty for the current scope of Cerebrate. This might increase over the time with additional features being added, but the goal is to keep Cerebrate as lean as possible. Expect to have at least 40GB of disk space, depending on your log rotation strategy you might want to go higher. # License From 5e2107cdb8cb13941514d7c2070477f6343d6701 Mon Sep 17 00:00:00 2001 From: Andras Iklody Date: Tue, 27 Apr 2021 23:55:32 +0200 Subject: [PATCH 2/5] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ea74248..a00ccc6 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,8 @@ Hardware requirements: A webserver with 4GB of memory and a single CPU core should be plenty for the current scope of Cerebrate. This might increase over the time with additional features being added, but the goal is to keep Cerebrate as lean as possible. Expect to have at least 40GB of disk space, depending on your log rotation strategy you might want to go higher. +For installation via docker, refer to the [cerebrate-docker](https://github.com/cerebrate-project/cerebrate-docker) repo. + # License ~~~~ From 00adbb0d7ea2e85185f58f4643321eb885c59ce3 Mon Sep 17 00:00:00 2001 From: Andras Iklody Date: Fri, 14 May 2021 13:21:23 +0200 Subject: [PATCH 3/5] fix: [metatemplates] updated MYSQL.sql --- INSTALL/mysql.sql | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/INSTALL/mysql.sql b/INSTALL/mysql.sql index 9f888dc..0846444 100644 --- a/INSTALL/mysql.sql +++ b/INSTALL/mysql.sql @@ -326,12 +326,17 @@ CREATE TABLE `meta_fields` ( `field` varchar(191) NOT NULL, `value` varchar(191) NOT NULL, `uuid` varchar(40) CHARACTER SET ascii DEFAULT NULL, + `meta_template_id` int(10) unsigned NOT NULL, + `meta_template_field_id` int(10) unsigned NOT NULL, + `is_default` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), KEY `scope` (`scope`), KEY `uuid` (`uuid`), KEY `parent_id` (`parent_id`), KEY `field` (`field`), - KEY `value` (`value`) + KEY `value` (`value`), + KEY `meta_template_id` (`meta_template_id`), + KEY `meta_template_field_id` (`meta_template_field_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; CREATE TABLE `meta_templates` ( From 32fc30a401e4861c3c4ebc85d2d8501c2c070e77 Mon Sep 17 00:00:00 2001 From: iglocska Date: Fri, 14 May 2021 13:31:19 +0200 Subject: [PATCH 4/5] fix: [baseurl] for openmodal actions in the index factory fixed, fixes #46 - invalid url by prepending any url (even # for modal tags) with the baseurl --- .../element/genericElements/IndexTable/Fields/actions.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/element/genericElements/IndexTable/Fields/actions.php b/templates/element/genericElements/IndexTable/Fields/actions.php index c50f3fb..ed94a65 100644 --- a/templates/element/genericElements/IndexTable/Fields/actions.php +++ b/templates/element/genericElements/IndexTable/Fields/actions.php @@ -35,7 +35,7 @@ } } $url_param_data_paths = ''; - $url = empty($action['url']) ? '#' : h($action['url']); + $url = empty($action['url']) ? '#' : $baseurl . h($action['url']); if (!empty($action['url_params_data_paths'])) { if (is_array($action['url_params_data_paths'])) { $temp = array(); @@ -90,8 +90,7 @@ $action['onclick'] = sprintf('UI.openModalFromURL(\'%s\', \'%s\', \'%s\')', $modal_url, $reload_url, $tableRandomValue); } echo sprintf( - ' ', - $baseurl, + ' ', $url, empty($action['title']) ? '' : h($action['title']), empty($action['title']) ? '' : h($action['title']), From cb28278f3000f84dcfeeabbc9a2d275b0369b797 Mon Sep 17 00:00:00 2001 From: iglocska Date: Fri, 14 May 2021 13:43:28 +0200 Subject: [PATCH 5/5] fix: [logout] url fixed, fixes #45 --- templates/element/genericElements/header_scaffold.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/element/genericElements/header_scaffold.php b/templates/element/genericElements/header_scaffold.php index 1fe6a2f..ac999d8 100644 --- a/templates/element/genericElements/header_scaffold.php +++ b/templates/element/genericElements/header_scaffold.php @@ -53,7 +53,7 @@ foreach ($data['menu'] as $name => $menuElement) { } } $logoutButton = sprintf( - '%s', + '%s', $baseurl, __('Logout') );