Skip to content

Commit

Permalink
v1
Browse files Browse the repository at this point in the history
  • Loading branch information
asilvafx committed Dec 29, 2024
1 parent 66f317a commit 9f5ff56
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
18 changes: 9 additions & 9 deletions app/data/db/setup.sql
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ def INTEGER DEFAULT 0
);

INSERT INTO permissions (id, name, def)
VALUES (0, 'Access', 1);
VALUES (1, 'Access', 1);
INSERT INTO permissions (id, name, def)
VALUES (1, 'Database', 1);
VALUES (2, 'Database', 1);
INSERT INTO permissions (id, name, def)
VALUES (2, 'API', 1);
VALUES (3, 'API', 1);
INSERT INTO permissions (id, name, def)
VALUES (3, 'Files', 1);
VALUES (4, 'Files', 1);
INSERT INTO permissions (id, name, def)
VALUES (4, 'Integrations', 1);
VALUES (5, 'Integrations', 1);
INSERT INTO permissions (id, name, def)
VALUES (5, 'Settings', 1);
VALUES (6, 'Settings', 1);
INSERT INTO permissions (id, name, def)
VALUES (6, 'Maintenance & Support', 1);
VALUES (7, 'Maintenance & Support', 1);

CREATE TABLE IF NOT EXISTS roles (
id INTEGER PRIMARY KEY AUTOINCREMENT,
Expand All @@ -41,9 +41,9 @@ is_admin INTEGER DEFAULT 0
);

INSERT INTO roles (id, name, description, access, color, def, is_admin)
VALUES (0, 'Admin', NULL, '*', NULL, 1, 1);
VALUES (1, 'Admin', NULL, '*', NULL, 1, 1);
INSERT INTO roles (id, name, description, access, color, def, is_admin)
VALUES (1, 'Member', NULL, NULL, NULL, 0, 0);
VALUES (2, 'Member', NULL, NULL, NULL, 0, 0);

CREATE TABLE IF NOT EXISTS site (
id INTEGER PRIMARY KEY AUTOINCREMENT,
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/routes/access/roles/edit/view.htm
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h5 class="modal-title" id="deleteModalLabel">Are you sure?</h5>
</span>
<select class="form-select" id="access" name="access" required="" multiple="">
<repeat group="{{@permissionsAll}}" value="{{@access}}">
<option value="{{@access.name}}" {{ @role.access==='*' || str_contains(@role.access, @access.name) ? 'selected' : '' }} >{{@access.name}}</option>
<option value="{{@access.name}}" {{ @role.access==='*' || (@role.access && str_contains(@role.access, @access.name)) ? 'selected' : '' }} >{{@access.name}}</option>
</repeat>
</select>
<span class="w-100 text-sm text-muted mt-2">Hold Ctrl (Windows) or Command (Mac) to select multiple permissions.</span>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/routes/access/roles/edit/view.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
exit;
}

if ($role->default === 1) {
if ($role->def === 1) {
$response->json('error', 'Role protected by system defaults.');
exit;
}
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/routes/access/roles/view.htm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<set name="{{@item.name}}"></set>
<set description="{{@item.description}}"></set>
<set roleId="{{@item.id}}"></set>
<set roleDefault="{{@item.default}}"></set>
<set roleDefault="{{@item.def}}"></set>
<tr>
<td><a class="text-body" aria-label="{{@name}}" href="/{{@SITE.uri_backend}}/access/roles/view?id={{@roleId}}">{{@name}}</a></td>
<td>{{@description}}</td>
Expand Down
1 change: 1 addition & 0 deletions app/views/admin/routes/access/roles/view/view.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
$f3->set('role.name', $roleName);
$f3->set('role.description', $role->description);
$f3->set('role.access', $role->access);
$f3->set('role.def', $role->def);
}
} else {
$f3->set('notfound', true);
Expand Down

0 comments on commit 9f5ff56

Please sign in to comment.