diff --git a/4dev/database/table/edit_access.sql b/4dev/database/table/edit_access.sql index bf0fe3fa..3b826fb2 100644 --- a/4dev/database/table/edit_access.sql +++ b/4dev/database/table/edit_access.sql @@ -14,5 +14,6 @@ CREATE TABLE edit_access ( uid VARCHAR, enabled SMALLINT NOT NULL DEFAULT 0, protected INT, - deleted SMALLINT DEFAULT 0 + deleted SMALLINT DEFAULT 0, + additional_acl JSONB ) INHERITS (edit_generic) WITHOUT OIDS; diff --git a/4dev/database/table/edit_group.sql b/4dev/database/table/edit_group.sql index 26f1ceaf..ca58b14a 100644 --- a/4dev/database/table/edit_group.sql +++ b/4dev/database/table/edit_group.sql @@ -13,7 +13,7 @@ CREATE TABLE edit_group ( deleted SMALLINT DEFAULT 0, edit_scheme_id INT, edit_access_right_id INT NOT NULL, - alternative_acl JSONB, + additional_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 61c21ae3..a3672dc2 100644 --- a/www/includes/edit_base.inc +++ b/www/includes/edit_base.inc @@ -411,6 +411,7 @@ if ($form->my_page_name == 'edit_order') { $elements[] = $form->formCreateElement("description"); // add name/value list here $elements[] = $form->formCreateElementListTable("edit_access_data"); + $elements[] = $form->formCreateElement("additional_acl"); break; default: print "[No valid page definition given]"; diff --git a/www/includes/table_arrays/array_edit_access.inc b/www/includes/table_arrays/array_edit_access.inc index 9c689a60..bad22517 100644 --- a/www/includes/table_arrays/array_edit_access.inc +++ b/www/includes/table_arrays/array_edit_access.inc @@ -49,7 +49,15 @@ $edit_access = array ( "1" => "Yes", "0" => "No" ) - ) + ), + "additional_acl" => array ( + "value" => $GLOBALS["additional_acl"], + "output_name" => "Additional ACL (as JSON)", + "type" => "textarea", + "error_check" => "json", + "rows" => 10, + "cols" => 60 + ), ), "table_name" => "edit_access", "load_query" => "SELECT edit_access_id, name FROM edit_access ORDER BY name", diff --git a/www/lib/CoreLibs/Basic.inc b/www/lib/CoreLibs/Basic.inc index a3f6b7f3..cc1bf59d 100644 --- a/www/lib/CoreLibs/Basic.inc +++ b/www/lib/CoreLibs/Basic.inc @@ -442,7 +442,7 @@ class Basic // on second call it sends the end time and then also prints the running time public function runningTime($simple = false) { - list($micro, $timestamp) = explode(" ", microtime()); + list($micro, $timestamp) = explode(' ', microtime()); $string = ''; $running_time = ''; if (!$this->starttime) {