From 8da45a06d00db67ed9df08e4688ceee6e1f628d6 Mon Sep 17 00:00:00 2001
From: Yasen Pramatarov <yasen@lindeas.com>
Date: Thu, 12 Sep 2024 11:54:57 +0300
Subject: [PATCH] Makes minor fixes to the rights management

---
 app/classes/user.php           | 19 +++++++++----------
 app/templates/profile-edit.php |  2 +-
 doc/jilo-web.schema            |  1 -
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/classes/user.php b/app/classes/user.php
index e275883..648f340 100644
--- a/app/classes/user.php
+++ b/app/classes/user.php
@@ -53,8 +53,8 @@ class User {
                     u.username
                 FROM
                     users_meta um
-                    LEFT JOIN users u
-                        ON um.user_id = u.id
+                LEFT JOIN users u
+                    ON um.user_id = u.id
                 WHERE
                     u.id = :user_id';
 
@@ -70,9 +70,9 @@ class User {
     // add user right
     public function addUserRight($user_id, $right_id) {
         $sql = 'INSERT INTO users_rights
-                    (user_id, right_id, enabled)
+                    (user_id, right_id)
                 VALUES
-                    (:user_id, :right_id, 1)';
+                    (:user_id, :right_id)';
         $query = $this->db->prepare($sql);
         $query->execute([
             ':user_id'		=> $user_id,
@@ -98,8 +98,9 @@ class User {
     public function getAllRights() {
         $sql = 'SELECT
                     id AS right_id,
-                    item AS right_name
-                FROM rights';
+                    name AS right_name
+                FROM rights
+                ORDER BY id ASC';
         $query = $this->db->prepare($sql);
         $query->execute();
 
@@ -113,7 +114,7 @@ class User {
                     u.id AS user_id,
                     u.username,
                     r.id AS right_id,
-                    r.item AS right_name
+                    r.name AS right_name
                 FROM
                     users u
                     LEFT JOIN users_rights ur
@@ -121,9 +122,7 @@ class User {
                     LEFT JOIN rights r
                         ON ur.right_id = r.id
                 WHERE
-                    u.id = :user_id
-                    AND
-                    ur.enabled = 1';
+                    u.id = :user_id';
 
         $query = $this->db->prepare($sql);
         $query->execute([
diff --git a/app/templates/profile-edit.php b/app/templates/profile-edit.php
index ed545b4..4e73191 100644
--- a/app/templates/profile-edit.php
+++ b/app/templates/profile-edit.php
@@ -73,7 +73,7 @@
                                         </div>
                                         <div class="col-md-8 text-start bg-light">
 <?php foreach ($allRights as $right) {
-    // Check if the current right exists in $userRights and is enabled
+    // Check if the current right exists in $userRights
     $isChecked = false;
     foreach ($userRights as $userRight) {
         if ($userRight['right_id'] === $right['right_id']) {
diff --git a/doc/jilo-web.schema b/doc/jilo-web.schema
index 6d9ec26..99e6169 100644
--- a/doc/jilo-web.schema
+++ b/doc/jilo-web.schema
@@ -16,7 +16,6 @@ CREATE TABLE users_meta (
 CREATE TABLE users_rights (
     user_id INTEGER,
     right_id INTEGER,
-    enabled INTEGER NOT NULL CHECK (enabled IN (0, 1)),
     PRIMARY KEY (user_id, right_id),
     FOREIGN KEY (user_id) REFERENCES users(id),
     FOREIGN KEY (right_id) REFERENCES rights(id)