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

Improve permissions list display, to be sorted.

Browse Source 
Better permission names for "admin users" and "admin roles".
This commit is contained in:
Jocelyn FIAT
2015-08-04 16:42:06 +02:00
parent 62ef07c86b
commit bbf7456fa2
13 changed files with 124 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/node/cms_node_api.e
View File

@@ -299,16 +299,6 @@ feature -- Permission Scope: Node
Result := cms_api.user_has_permission (a_user, a_action + " own " + l_type_name)
end
end
fixme ("when admin back end is ready, remove this, as too general.") -- FIXME
if not Result then
Result := cms_api.user_has_permission (a_user, a_action + " any node")
if not Result and a_user /= Void then
if is_author_of_node (a_user, a_node) then
Result := cms_api.user_has_permission (a_user, a_action + " own node")
end
end
end
end
feature -- Change: Node

30
modules/node/cms_node_module.e
View File

@@ -140,26 +140,28 @@ feature -- Access
permissions: LIST [READABLE_STRING_8]
-- <Precursor>.
local
l_type_name: READABLE_STRING_8
do
Result := Precursor
Result.force ("create any")
Result.force ("view any")
Result.force ("edit any")
Result.force ("delete any")
Result.force ("view own")
Result.force ("edit own")
Result.force ("delete own")
Result.force ("create any node")
if attached node_api as l_node_api then
across
l_node_api.content_types as ic
loop
Result.force ("create " + ic.item.name)
Result.force ("view " + ic.item.name)
Result.force ("edit " + ic.item.name)
Result.force ("delete " + ic.item.name)
Result.force ("view own " + ic.item.name)
Result.force ("edit own " + ic.item.name)
Result.force ("delete own " + ic.item.name)
l_type_name := ic.item.name
if not l_type_name.is_whitespace then
Result.force ("create " + l_type_name)
Result.force ("view any " + l_type_name)
Result.force ("edit any " + l_type_name)
Result.force ("delete any " + l_type_name)
Result.force ("view own " + l_type_name)
Result.force ("edit own " + l_type_name)
Result.force ("delete own " + l_type_name)
end
end
end
end