2023-08-09 15:06:57 (UTC-03:00)

Marcel Rodrigues <marcelgmr@gmail.com>

get comment author

diff --git a/data.lua b/data.lua
index 5753297..6ec7c07 100644
--- a/data.lua
+++ b/data.lua
@@ -257,22 +257,22 @@ function Model:add_comment(user_id, ticket_id, text)
     return code
 end
 
-function Model:get_comment(ticket_id, code, full)
+function Model:get_comment(ticket_id, code)
+    local query = "SELECT * FROM Comment WHERE ticket_id = ? AND code = ?;"
+    return self.db:execute(query, ticket_id, code)[1]
+end
+
+function Model:get_comments(ticket_id, full)
     local query
     if full then
         query = [[
             SELECT Comment.*, User.nick AS author_nick, User.name AS author_name
             FROM Comment JOIN User ON Comment.user_id = User.id
-            WHERE Comment.ticket_id = ? AND Comment.code = ?;
+            WHERE Comment.ticket_id = ?;
         ]]
     else
-        query = "SELECT * FROM Comment WHERE ticket_id = ? AND code = ?;"
+        query = "SELECT * FROM Comment WHERE ticket_id = ? ORDER BY code ASC;"
     end
-    return self.db:execute(query, ticket_id, code)[1]
-end
-
-function Model:get_comments(ticket_id)
-    local query = "SELECT * FROM Comment WHERE ticket_id = ? ORDER BY code ASC;"
     return self.db:execute(query, ticket_id)
 end
 

diff --git a/skopos.lua b/skopos.lua
index 904fdf0..25a561f 100644
--- a/skopos.lua
+++ b/skopos.lua
@@ -229,7 +229,7 @@ function App:routes()
         if proj == nil then return "not found", 404 end
         local tick = self.model:get_ticket(proj.id, tcode, true)
         if tick == nil then return "not found", 404 end
-        local comments = self.model:get_comments(tick.id)
+        local comments = self.model:get_comments(tick.id, true)
         local env = {
             title=self.title, user=user, proj=proj, tick=tick,
             states=self.model.states, comments=comments