Merge branch 'master' into es17.01

This commit is contained in:
Jocelyn Fiat
2017-03-30 19:15:47 +02:00
4 changed files with 117 additions and 8 deletions

View File

@@ -260,7 +260,7 @@ feature -- Form
l_node_path: READABLE_STRING_8
l_path_alias, l_existing_path_alias, l_auto_path_alias: detachable READABLE_STRING_8
do
fixme ("Refactor code per operation: Preview, Save/Publish/UnPublish")
-- Potential operations : Preview, Save/Publish/UnPublish")
l_preview := attached {WSF_STRING} fd.item ("op") as l_op and then l_op.same_string (preview_submit_label)
if not l_preview then
l_op_save := True

View File

@@ -139,9 +139,7 @@ feature -- HTTP Methods
elseif l_node = Void then
send_not_found (req, res)
else
if
l_rev > 0 and l_is_published
then
if l_is_published then
create view_response.make (req, res, api, node_api)
view_response.set_node (l_node)
view_response.set_revision (l_rev)
@@ -149,7 +147,9 @@ feature -- HTTP Methods
elseif
attached api.user as l_user and then
( node_api.is_author_of_node (l_user, l_node)
or else api.user_has_permission (l_user, "view unpublished " + l_node.content_type)
or else (
api.user_has_permission (l_user, "view unpublished " + l_node.content_type)
)
)
then
create view_response.make (req, res, api, node_api)