From 5d81f1d195476b05245b2a92b67456ba5185be18 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Mon, 3 Aug 2015 12:56:05 +0200 Subject: [PATCH] Improve previous commit to show allowed tabs only if user has access to it. --- .../node/handler/cms_content_type_webform_manager.e | 2 -- modules/node/handler/cms_node_type_webform_manager.e | 10 ++++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/node/handler/cms_content_type_webform_manager.e b/modules/node/handler/cms_content_type_webform_manager.e index 05854d0..4070ec0 100644 --- a/modules/node/handler/cms_content_type_webform_manager.e +++ b/modules/node/handler/cms_content_type_webform_manager.e @@ -12,8 +12,6 @@ deferred class inherit CMS_API_ACCESS - CMS_REQUEST_UTIL - feature {NONE} -- Initialization make (a_type: like content_type) diff --git a/modules/node/handler/cms_node_type_webform_manager.e b/modules/node/handler/cms_node_type_webform_manager.e index 739ef83..a278e46 100644 --- a/modules/node/handler/cms_node_type_webform_manager.e +++ b/modules/node/handler/cms_node_type_webform_manager.e @@ -227,12 +227,12 @@ feature -- Forms ... end l_node.set_author (response.user) - --Summary + --Summary if attached fd.string_item ("summary") as l_summary then s := l_summary end - --Content + --Content if attached fd.string_item ("body") as l_body then b := l_body end @@ -267,9 +267,7 @@ feature -- Output a_response.add_variable (a_node, "node") -- Show tabs only if a user is authenticated. - if - attached current_user (a_response.request) as l_user - then + if attached a_response.user as l_user then lnk := a_response.node_local_link (a_node, a_response.translation ("View", Void)) lnk.set_weight (1) a_response.add_to_primary_tabs (lnk) @@ -288,7 +286,7 @@ feature -- Output a_node /= Void and then a_node.id > 0 and then attached node_api.node_type_for (a_node) as l_type and then - node_api.has_permission_for_action_on_node ("delete", a_node, a_response.current_user (a_response.request)) + node_api.has_permission_for_action_on_node ("delete", a_node, l_user) then create lnk.make ("Delete", node_api.node_path (a_node) + "/delete") lnk.set_weight (3)