CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Additional ACL jsonb field to edit_pages table

Browse Source
This commit is contained in:
Clemens Schwaighofer
2019-08-27 15:15:40 +09:00
parent 47ffec1fd4
commit c5d624a318
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
4dev/database/table/edit_group.sql
View File

@@ -12,6 +12,7 @@ CREATE TABLE edit_group (
enabled SMALLINT NOT NULL DEFAULT 0, enabled SMALLINT NOT NULL DEFAULT 0,
edit_scheme_id INT, edit_scheme_id INT,
edit_access_right_id INT NOT NULL, 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_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 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; ) INHERITS (edit_generic) WITHOUT OIDS;

1
www/includes/edit_base.inc
View File

@@ -392,6 +392,7 @@ if ($form->my_page_name == 'edit_order') {
$elements[] = $form->formCreateElement("edit_access_right_id"); $elements[] = $form->formCreateElement("edit_access_right_id");
$elements[] = $form->formCreateElement("edit_scheme_id"); $elements[] = $form->formCreateElement("edit_scheme_id");
$elements[] = $form->formCreateElementListTable("edit_page_access"); $elements[] = $form->formCreateElementListTable("edit_page_access");
$elements[] = $form->formCreateElement("additional_acl");
break; break;
case "edit_visible_group": case "edit_visible_group":
$elements[] = $form->formCreateElement("name"); $elements[] = $form->formCreateElement("name");

10
www/includes/table_arrays/array_edit_groups.inc
View File

@@ -37,7 +37,15 @@ $edit_groups = array (
"int_null" => 1, "int_null" => 1,
"type" => "drop_down_db", "type" => "drop_down_db",
"query" => "SELECT edit_scheme_id, name FROM edit_scheme WHERE enabled = 1 ORDER BY name" "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", "load_query" => "SELECT edit_group_id, name, enabled FROM edit_group ORDER BY name",
"table_name" => "edit_group", "table_name" => "edit_group",