Made CMS_SETUP.site_url detachable.
Cosmetic, avoid long lines of comments.
Added debug ("refactor_fixme") around a few REFACTORING_HELPER.fixme (...)
Better message for a few fixme(...) related to unimplemented routines.
This commit is contained in:
@@ -1,8 +1,14 @@
|
|||||||
note
|
note
|
||||||
description: "[
|
description: "[
|
||||||
Configure the basic settings for a CMS application, for example where to look for themes, the name of the application, etc.
|
Configure the basic settings for a CMS application,
|
||||||
The settings can be configured by default using the current working directory, using the commands provided by the class or by an external configuration file
|
i.e: where to look for themes, name of the application, etc...
|
||||||
|
|
||||||
|
The settings can be configured by default:
|
||||||
|
- using the current working directory,
|
||||||
|
- using the commands provided by the class
|
||||||
|
- or by an external configuration file.
|
||||||
]"
|
]"
|
||||||
|
|
||||||
class
|
class
|
||||||
CMS_CONFIGURATION
|
CMS_CONFIGURATION
|
||||||
|
|
||||||
@@ -119,7 +125,7 @@ feature -- Access
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
site_url (dft: like site_url): READABLE_STRING_8
|
site_url (dft: like site_url): detachable READABLE_STRING_8
|
||||||
do
|
do
|
||||||
if attached options.item ("site.url") as s then
|
if attached options.item ("site.url") as s then
|
||||||
Result := s
|
Result := s
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ feature {NONE} -- Initialization
|
|||||||
configure
|
configure
|
||||||
do
|
do
|
||||||
site_id := configuration.site_id
|
site_id := configuration.site_id
|
||||||
site_url := configuration.site_url ("")
|
site_url := configuration.site_url (Void)
|
||||||
site_name := configuration.site_name ("EWF::CMS")
|
site_name := configuration.site_name ("EWF::CMS")
|
||||||
site_email := configuration.site_email ("webmaster")
|
site_email := configuration.site_email ("webmaster")
|
||||||
themes_location := configuration.themes_location
|
themes_location := configuration.themes_location
|
||||||
@@ -104,7 +104,7 @@ feature -- Compute location
|
|||||||
-- assets (js, css, images, etc)
|
-- assets (js, css, images, etc)
|
||||||
-- Not used at the moment.
|
-- Not used at the moment.
|
||||||
do
|
do
|
||||||
debug
|
debug ("refactor_fixme")
|
||||||
fixme ("Check if we really need it")
|
fixme ("Check if we really need it")
|
||||||
end
|
end
|
||||||
theme_resource_location := theme_location
|
theme_resource_location := theme_location
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
note
|
note
|
||||||
description: "[
|
description: "[
|
||||||
CMS API Layout, to provide paths
|
CMS Layout providing file system locations for
|
||||||
*config
|
- config
|
||||||
*application
|
- application
|
||||||
*logs
|
- logs
|
||||||
*documentation
|
- documentation
|
||||||
*themes
|
- themes
|
||||||
]"
|
]"
|
||||||
date: "$Date$"
|
date: "$Date$"
|
||||||
revision: "$Revision$"
|
revision: "$Revision$"
|
||||||
|
|||||||
@@ -39,8 +39,8 @@ feature -- Access: Site
|
|||||||
site_email: READABLE_STRING_8
|
site_email: READABLE_STRING_8
|
||||||
-- Email for the site.
|
-- Email for the site.
|
||||||
|
|
||||||
site_url: READABLE_STRING_8
|
site_url: detachable READABLE_STRING_8
|
||||||
-- Base url of the site.
|
-- Optional base url of the site.
|
||||||
|
|
||||||
front_page_path: detachable READABLE_STRING_8
|
front_page_path: detachable READABLE_STRING_8
|
||||||
-- Optional path defining the front page.
|
-- Optional path defining the front page.
|
||||||
|
|||||||
@@ -94,7 +94,9 @@ feature -- Access: Node
|
|||||||
nodes: LIST[CMS_NODE]
|
nodes: LIST[CMS_NODE]
|
||||||
-- List of nodes.
|
-- List of nodes.
|
||||||
do
|
do
|
||||||
|
debug ("refactor_fixme")
|
||||||
fixme ("Implementation")
|
fixme ("Implementation")
|
||||||
|
end
|
||||||
Result := storage.recent_nodes (0, 10)
|
Result := storage.recent_nodes (0, 10)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -107,7 +109,9 @@ feature -- Access: Node
|
|||||||
node (a_id: INTEGER_64): detachable CMS_NODE
|
node (a_id: INTEGER_64): detachable CMS_NODE
|
||||||
-- Node by ID.
|
-- Node by ID.
|
||||||
do
|
do
|
||||||
|
debug ("refactor_fixme")
|
||||||
fixme ("Check preconditions")
|
fixme ("Check preconditions")
|
||||||
|
end
|
||||||
Result := storage.node (a_id)
|
Result := storage.node (a_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -134,21 +138,27 @@ feature -- Change: Node
|
|||||||
update_node_title (a_id: like {CMS_USER}.id; a_node_id: like {CMS_NODE}.id; a_title: READABLE_STRING_32)
|
update_node_title (a_id: like {CMS_USER}.id; a_node_id: like {CMS_NODE}.id; a_title: READABLE_STRING_32)
|
||||||
-- Update node title, with user identified by `a_id', with node id `a_node_id' and a new title `a_title'.
|
-- Update node title, with user identified by `a_id', with node id `a_node_id' and a new title `a_title'.
|
||||||
do
|
do
|
||||||
|
debug ("refactor_fixme")
|
||||||
fixme ("Check preconditions")
|
fixme ("Check preconditions")
|
||||||
|
end
|
||||||
storage.update_node_title (a_id,a_node_id,a_title)
|
storage.update_node_title (a_id,a_node_id,a_title)
|
||||||
end
|
end
|
||||||
|
|
||||||
update_node_summary (a_id: like {CMS_USER}.id; a_node_id: like {CMS_NODE}.id; a_summary: READABLE_STRING_32)
|
update_node_summary (a_id: like {CMS_USER}.id; a_node_id: like {CMS_NODE}.id; a_summary: READABLE_STRING_32)
|
||||||
-- Update node summary, with user identified by `a_id', with node id `a_node_id' and a new summary `a_summary'.
|
-- Update node summary, with user identified by `a_id', with node id `a_node_id' and a new summary `a_summary'.
|
||||||
do
|
do
|
||||||
|
debug ("refactor_fixme")
|
||||||
fixme ("Check preconditions")
|
fixme ("Check preconditions")
|
||||||
|
end
|
||||||
storage.update_node_summary (a_id,a_node_id, a_summary)
|
storage.update_node_summary (a_id,a_node_id, a_summary)
|
||||||
end
|
end
|
||||||
|
|
||||||
update_node_content (a_id: like {CMS_USER}.id; a_node_id: like {CMS_NODE}.id; a_content: READABLE_STRING_32)
|
update_node_content (a_id: like {CMS_USER}.id; a_node_id: like {CMS_NODE}.id; a_content: READABLE_STRING_32)
|
||||||
-- Update node content, with user identified by `a_id', with node id `a_node_id' and a new content `a_content'.
|
-- Update node content, with user identified by `a_id', with node id `a_node_id' and a new content `a_content'.
|
||||||
do
|
do
|
||||||
|
debug ("refactor_fixme")
|
||||||
fixme ("Check preconditions")
|
fixme ("Check preconditions")
|
||||||
|
end
|
||||||
storage.update_node_content (a_id,a_node_id, a_content)
|
storage.update_node_content (a_id,a_node_id, a_content)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -172,9 +182,11 @@ feature -- Change User
|
|||||||
then
|
then
|
||||||
storage.save_user (a_user)
|
storage.save_user (a_user)
|
||||||
else
|
else
|
||||||
|
debug ("refactor_fixme")
|
||||||
fixme ("Add error")
|
fixme ("Add error")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
feature {NONE} -- Implemenataion
|
feature {NONE} -- Implemenataion
|
||||||
|
|||||||
@@ -245,7 +245,7 @@ feature -- Execution
|
|||||||
execute_default (req: WSF_REQUEST; res: WSF_RESPONSE)
|
execute_default (req: WSF_REQUEST; res: WSF_RESPONSE)
|
||||||
-- Default request handler if no other are relevant
|
-- Default request handler if no other are relevant
|
||||||
do
|
do
|
||||||
fixme ("To Implement")
|
to_implement ("Default response for CMS_SERVICE")
|
||||||
end
|
end
|
||||||
|
|
||||||
note
|
note
|
||||||
|
|||||||
@@ -274,10 +274,12 @@ feature -- Blocks initialization
|
|||||||
local
|
local
|
||||||
l_table: like block_region_settings
|
l_table: like block_region_settings
|
||||||
do
|
do
|
||||||
|
debug ("refactor_fixme")
|
||||||
fixme ("CHECK:Can we use the same structure as in theme.info?")
|
fixme ("CHECK:Can we use the same structure as in theme.info?")
|
||||||
|
fixme ("let the user choose ...")
|
||||||
|
end
|
||||||
create regions.make_caseless (5)
|
create regions.make_caseless (5)
|
||||||
|
|
||||||
fixme ("let the user choose ...")
|
|
||||||
create l_table.make_caseless (10)
|
create l_table.make_caseless (10)
|
||||||
l_table["top"] := "top"
|
l_table["top"] := "top"
|
||||||
l_table["header"] := "header"
|
l_table["header"] := "header"
|
||||||
@@ -338,7 +340,9 @@ feature -- Blocks
|
|||||||
|
|
||||||
get_blocks
|
get_blocks
|
||||||
do
|
do
|
||||||
|
debug ("refactor_fixme")
|
||||||
fixme ("find a way to have this in configuration or database, and allow different order")
|
fixme ("find a way to have this in configuration or database, and allow different order")
|
||||||
|
end
|
||||||
add_block (top_header_block, "top")
|
add_block (top_header_block, "top")
|
||||||
add_block (header_block, "header")
|
add_block (header_block, "header")
|
||||||
if attached message_block as m then
|
if attached message_block as m then
|
||||||
@@ -796,7 +800,9 @@ feature -- Generation
|
|||||||
common_prepare (page: CMS_HTML_PAGE)
|
common_prepare (page: CMS_HTML_PAGE)
|
||||||
-- Common preparation for page `page'.
|
-- Common preparation for page `page'.
|
||||||
do
|
do
|
||||||
|
debug ("refactor_fixme")
|
||||||
fixme ("Fix generation common")
|
fixme ("Fix generation common")
|
||||||
|
end
|
||||||
|
|
||||||
-- Information
|
-- Information
|
||||||
page.set_title (title)
|
page.set_title (title)
|
||||||
|
|||||||
@@ -37,7 +37,9 @@ feature -- Conversion
|
|||||||
|
|
||||||
menu_html (a_menu: CMS_MENU; is_horizontal: BOOLEAN): STRING_8
|
menu_html (a_menu: CMS_MENU; is_horizontal: BOOLEAN): STRING_8
|
||||||
do
|
do
|
||||||
|
debug ("refactor_fixme")
|
||||||
fixme ("Refactor HTML code to use the new Bootstrap theme template")
|
fixme ("Refactor HTML code to use the new Bootstrap theme template")
|
||||||
|
end
|
||||||
create Result.make_from_string ("<div id=%""+ a_menu.name +"%" class=%"menu%">")
|
create Result.make_from_string ("<div id=%""+ a_menu.name +"%" class=%"menu%">")
|
||||||
if is_horizontal then
|
if is_horizontal then
|
||||||
Result.append ("<ul class=%"horizontal%" >%N")
|
Result.append ("<ul class=%"horizontal%" >%N")
|
||||||
@@ -57,7 +59,9 @@ feature -- Conversion
|
|||||||
local
|
local
|
||||||
s: STRING
|
s: STRING
|
||||||
do
|
do
|
||||||
|
debug ("refactor_fixme")
|
||||||
fixme ("Refactor HTML code to use the new Bootstrap theme template")
|
fixme ("Refactor HTML code to use the new Bootstrap theme template")
|
||||||
|
end
|
||||||
if attached {CMS_CONTENT_BLOCK} a_block as l_content_block and then l_content_block.is_raw then
|
if attached {CMS_CONTENT_BLOCK} a_block as l_content_block and then l_content_block.is_raw then
|
||||||
create s.make_empty
|
create s.make_empty
|
||||||
if attached l_content_block.title as l_title then
|
if attached l_content_block.title as l_title then
|
||||||
@@ -87,7 +91,9 @@ feature {NONE} -- Implementation
|
|||||||
local
|
local
|
||||||
cl: STRING
|
cl: STRING
|
||||||
do
|
do
|
||||||
|
debug ("refactor_fixme")
|
||||||
fixme ("Remove HTML from Eiffel")
|
fixme ("Remove HTML from Eiffel")
|
||||||
|
end
|
||||||
create cl.make_empty
|
create cl.make_empty
|
||||||
if lnk.is_active then
|
if lnk.is_active then
|
||||||
cl.append ("active ")
|
cl.append ("active ")
|
||||||
|
|||||||
@@ -25,9 +25,13 @@ feature{NONE} -- Initialization
|
|||||||
set_creation_date (l_time)
|
set_creation_date (l_time)
|
||||||
set_modification_date (l_time)
|
set_modification_date (l_time)
|
||||||
set_publication_date (l_time)
|
set_publication_date (l_time)
|
||||||
|
debug ("refactor_fixme")
|
||||||
fixme ("Remove harcode format")
|
fixme ("Remove harcode format")
|
||||||
|
end
|
||||||
set_format ("HTML")
|
set_format ("HTML")
|
||||||
|
debug ("refactor_fixme")
|
||||||
fixme ("Remove harcode content type")
|
fixme ("Remove harcode content type")
|
||||||
|
end
|
||||||
set_content_type ("Page")
|
set_content_type ("Page")
|
||||||
ensure
|
ensure
|
||||||
content_set: content = a_content
|
content_set: content = a_content
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ feature -- Access: user
|
|||||||
|
|
||||||
all_users: LIST [CMS_USER]
|
all_users: LIST [CMS_USER]
|
||||||
do
|
do
|
||||||
to_implement("Not implemented!!!")
|
to_implement (generator + ".all_users")
|
||||||
create {ARRAYED_LIST[CMS_USER]} Result.make (0)
|
create {ARRAYED_LIST[CMS_USER]} Result.make (0)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -88,14 +88,14 @@ feature -- User Nodes
|
|||||||
user_collaborator_nodes (a_id: like {CMS_USER}.id): LIST[CMS_NODE]
|
user_collaborator_nodes (a_id: like {CMS_USER}.id): LIST[CMS_NODE]
|
||||||
-- Possible list of nodes where the user identified by `a_id', is a collaborator.
|
-- Possible list of nodes where the user identified by `a_id', is a collaborator.
|
||||||
do
|
do
|
||||||
fixme ("Not implemented!!!")
|
to_implement (generator + ".user_collaborator_nodes")
|
||||||
create {ARRAYED_LIST[CMS_NODE]} Result.make (0)
|
create {ARRAYED_LIST[CMS_NODE]} Result.make (0)
|
||||||
end
|
end
|
||||||
|
|
||||||
user_author_nodes (a_id: like {CMS_USER}.id): LIST[CMS_NODE]
|
user_author_nodes (a_id: like {CMS_USER}.id): LIST[CMS_NODE]
|
||||||
-- Possible list of nodes where the user identified by `a_id', is the author.
|
-- Possible list of nodes where the user identified by `a_id', is the author.
|
||||||
do
|
do
|
||||||
fixme ("Not implemented!!!")
|
to_implement (generator + ".user_author_nodes")
|
||||||
create {ARRAYED_LIST[CMS_NODE]} Result.make (0)
|
create {ARRAYED_LIST[CMS_NODE]} Result.make (0)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -103,12 +103,12 @@ feature -- Access: roles and permissions
|
|||||||
|
|
||||||
user_role_by_id (a_id: like {CMS_USER_ROLE}.id): detachable CMS_USER_ROLE
|
user_role_by_id (a_id: like {CMS_USER_ROLE}.id): detachable CMS_USER_ROLE
|
||||||
do
|
do
|
||||||
fixme ("Not Implemented!!!")
|
to_implement (generator + ".user_role_by_id")
|
||||||
end
|
end
|
||||||
|
|
||||||
user_roles: LIST [CMS_USER_ROLE]
|
user_roles: LIST [CMS_USER_ROLE]
|
||||||
do
|
do
|
||||||
fixme ("Not Implemented!!!")
|
to_implement (generator + ".user_roles")
|
||||||
create {ARRAYED_LIST[CMS_USER_ROLE]} Result.make (0)
|
create {ARRAYED_LIST[CMS_USER_ROLE]} Result.make (0)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -116,7 +116,7 @@ feature -- Change: roles and permissions
|
|||||||
|
|
||||||
save_user_role (a_user_role: CMS_USER_ROLE)
|
save_user_role (a_user_role: CMS_USER_ROLE)
|
||||||
do
|
do
|
||||||
fixme ("Not Implemented!!!")
|
to_implement (generator + ".save_user_role")
|
||||||
end
|
end
|
||||||
|
|
||||||
feature -- Change: user
|
feature -- Change: user
|
||||||
@@ -133,6 +133,9 @@ feature -- Change: user
|
|||||||
user_provider.new_user (a_user.name, l_password, l_email)
|
user_provider.new_user (a_user.name, l_password, l_email)
|
||||||
connection.commit
|
connection.commit
|
||||||
else
|
else
|
||||||
|
debug ("refactor_fixme")
|
||||||
|
fixme ("maybe we should not always carry password, in this case, to implement the else part..")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user