From c5d624a3189d353c70814ecf036e71b098147d58 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Tue, 27 Aug 2019 15:15:40 +0900 Subject: [PATCH] Add Additional ACL jsonb field to edit_pages table --- 4dev/database/table/edit_group.sql | 1 + www/includes/edit_base.inc | 1 + www/includes/table_arrays/array_edit_groups.inc | 10 +++++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/4dev/database/table/edit_group.sql b/4dev/database/table/edit_group.sql index 7b07f791..083e7fe4 100644 --- a/4dev/database/table/edit_group.sql +++ b/4dev/database/table/edit_group.sql @@ -12,6 +12,7 @@ CREATE TABLE edit_group ( enabled SMALLINT NOT NULL DEFAULT 0, edit_scheme_id INT, edit_access_right_id INT NOT NULL, + alternative_acl JSONB, FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE, FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE ) INHERITS (edit_generic) WITHOUT OIDS; diff --git a/www/includes/edit_base.inc b/www/includes/edit_base.inc index d4fc00a8..61c21ae3 100644 --- a/www/includes/edit_base.inc +++ b/www/includes/edit_base.inc @@ -392,6 +392,7 @@ if ($form->my_page_name == 'edit_order') { $elements[] = $form->formCreateElement("edit_access_right_id"); $elements[] = $form->formCreateElement("edit_scheme_id"); $elements[] = $form->formCreateElementListTable("edit_page_access"); + $elements[] = $form->formCreateElement("additional_acl"); break; case "edit_visible_group": $elements[] = $form->formCreateElement("name"); diff --git a/www/includes/table_arrays/array_edit_groups.inc b/www/includes/table_arrays/array_edit_groups.inc index 095b1760..d92281be 100644 --- a/www/includes/table_arrays/array_edit_groups.inc +++ b/www/includes/table_arrays/array_edit_groups.inc @@ -37,7 +37,15 @@ $edit_groups = array ( "int_null" => 1, "type" => "drop_down_db", "query" => "SELECT edit_scheme_id, name FROM edit_scheme WHERE enabled = 1 ORDER BY name" - ) + ), + "additional_acl" => array ( + "value" => $GLOBALS["additional_acl"], + "output_name" => "Additional ACL (as JSON)", + "type" => "textarea", + "error_check" => "json", + "rows" => 10, + "cols" => 60 + ), ), "load_query" => "SELECT edit_group_id, name, enabled FROM edit_group ORDER BY name", "table_name" => "edit_group",