Feature #1112: Integrate clusters into acl rules

This commit is contained in:
Carlos Martín committed 2012-02-28 15:29:32 +01:00
1 parent 4d5ea6f8a2
commit 98fcd42e2b
7 files changed
+20 -15

No files matched your search

+3 -3
View File
@@ -9,9 +9,9 @@
:size: 8
:right: true
:RES_VHNIUTGD:
:RES_VHNIUTGDC:
:desc: Which resource the rule applies to
:size: 12
:size: 13
:RID:
:desc: Resource ID
@@ -26,6 +26,6 @@
:default:
- :ID
- :USER
- :RES_VHNIUTGD
- :RES_VHNIUTGDC
- :RID
- :OPE_UMAC
+6 -4
View File
@@ -44,7 +44,7 @@ private
def self.resource_mask(str)
resource_type=str.split("/")[0]
mask = "--------"
mask = "---------"
resource_type.split("+").each{|type|
case type
@@ -64,6 +64,8 @@ private
mask[6] = "G"
when "DATASTORE"
mask[7] = "D"
when "CLUSTER"
mask[8] = "C"
end
}
mask
@@ -103,8 +105,8 @@ private
d['STRING'].split(" ")[0]
end
column :RES_VHNIUTGD, "Resource to which the rule applies",
:size => 12 do |d|
column :RES_VHNIUTGDC, "Resource to which the rule applies",
:size => 13 do |d|
OneAclHelper::resource_mask d['STRING'].split(" ")[1]
end
@@ -117,7 +119,7 @@ private
OneAclHelper::right_mask d['STRING'].split(" ")[2]
end
default :ID, :USER, :RES_VHNIUTGD, :RID, :OPE_UMAC
default :ID, :USER, :RES_VHNIUTGDC, :RID, :OPE_UMAC
end
table