backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added CMS_NODE.is_published and is_trashed: BOOLEAN

Browse Source 
For now, whenever we save a node, it is marked as published.
Display a node only if published.
Updated /trash page.
Updated /nodes/ page to take into account the node status.
This commit is contained in:
Jocelyn FIAT
2015-07-16 17:16:35 +02:00
parent 769c14caf8
commit d8ac46f8b0
9 changed files with 97 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/node/persistence/cms_node_storage_i.e
View File

@@ -73,8 +73,10 @@ feature -- Access
deferred
end
trashed_nodes (a_user_id: INTEGER_64): LIST [CMS_NODE]
-- List of nodes by user `a_user_id'.
trashed_nodes (a_user: detachable CMS_USER): LIST [CMS_NODE]
-- List of nodes by user `a_user' if set, or any.
require
a_user /= Void implies a_user.has_id
deferred
end

4
modules/node/persistence/cms_node_storage_null.e
View File

@@ -41,8 +41,8 @@ feature -- Access: node
create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
end
trashed_nodes (a_user_id: INTEGER_64): LIST [CMS_NODE]
-- List of nodes by user `a_user_id'.
trashed_nodes (a_user: detachable CMS_USER): LIST [CMS_NODE]
-- <Precursor>.
do
create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
end

13
modules/node/persistence/cms_node_storage_sql.e
View File

@@ -60,7 +60,7 @@ feature -- Access
-- end
end
trashed_nodes (a_user_id: INTEGER_64): LIST [CMS_NODE]
trashed_nodes (a_user: detachable CMS_USER): LIST [CMS_NODE]
-- List of nodes.
local
l_parameters: STRING_TABLE [detachable ANY]
@@ -72,9 +72,8 @@ feature -- Access
from
create l_parameters.make (1)
if a_user_id > 1 then
-- Not admin user
l_parameters.put (a_user_id, "author")
if a_user /= Void and then a_user.has_id then
l_parameters.put (a_user.id, "author")
sql_query (sql_select_trash_nodes_by_author, l_parameters)
else
sql_query (sql_select_trash_nodes, Void)
@@ -295,15 +294,15 @@ feature {NONE} -- Queries
-- Nodes count (Published and not Published)
--| note: {CMS_NODE_API}.trashed = -1
sql_select_nodes: STRING = "SELECT * FROM nodes WHERE status != -1 ;"
sql_select_nodes: STRING = "SELECT nid, revision, type, title, summary, content, format, author, publish, created, changed, status FROM nodes WHERE status != -1 ;"
-- SQL Query to retrieve all nodes.
--| note: {CMS_NODE_API}.trashed = -1
sql_select_trash_nodes: STRING = "SELECT * FROM nodes WHERE status = -1 ;"
sql_select_trash_nodes: STRING = "SELECT nid, revision, type, title, summary, content, format, author, publish, created, changed, status FROM nodes WHERE status = -1 ;"
-- SQL Query to retrieve all trahsed nodes.
--| note: {CMS_NODE_API}.trashed = -1
sql_select_trash_nodes_by_author: STRING = "SELECT * FROM nodes WHERE status = -1 and author = :author ;"
sql_select_trash_nodes_by_author: STRING = "SELECT nid, revision, type, title, summary, content, format, author, publish, created, changed, status FROM nodes WHERE status = -1 and author = :author ;"
-- SQL Query to retrieve all nodes by a given author.
--| note: {CMS_NODE_API}.trashed = -1