diff --git a/INSTALL/mysql.sql b/INSTALL/mysql.sql index c2f8f64..0d52940 100644 --- a/INSTALL/mysql.sql +++ b/INSTALL/mysql.sql @@ -341,12 +341,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` ( diff --git a/README.md b/README.md index f08efb8..a00ccc6 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,9 @@ 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. + +For installation via docker, refer to the [cerebrate-docker](https://github.com/cerebrate-project/cerebrate-docker) repo. # License 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']),