Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos.core
Commits
5f4321c3
Commit
5f4321c3
authored
Nov 07, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop not needed categories.
role provides no group.
parent
c30b6af2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
master/bt5/slapos_cloud/ExtensionTemplateItem/SlapOSSecurity.py
.../bt5/slapos_cloud/ExtensionTemplateItem/SlapOSSecurity.py
+2
-2
master/bt5/slapos_cloud/bt/revision
master/bt5/slapos_cloud/bt/revision
+1
-1
No files found.
master/bt5/slapos_cloud/ExtensionTemplateItem/SlapOSSecurity.py
View file @
5f4321c3
...
...
@@ -49,7 +49,7 @@ def getComputerSecurityCategory(self, base_category_list, user_name,
for
base_category
in
base_category_list
:
if
base_category
==
"role"
:
category_list
.
append
(
{
base_category
:
[
'role
'
,
'role
/computer'
]})
{
base_category
:
[
'role/computer'
]})
elif
len
(
computer_list
)
>
1
:
raise
ConsistencyError
,
"Error: There is more than one Computer "
\
"with reference '%s'"
%
user_name
...
...
@@ -75,7 +75,7 @@ def getSoftwareInstanceSecurityCategory(self, base_category_list, user_name,
category_dict
=
{}
for
base_category
in
base_category_list
:
if
base_category
==
"role"
:
category_dict
.
setdefault
(
base_category
,
[]).
extend
([
'role
'
,
'role
/instance'
])
category_dict
.
setdefault
(
base_category
,
[]).
extend
([
'role/instance'
])
if
base_category
==
"aggregate"
:
software_instance
=
software_instance_list
[
0
]
hosting_item
=
software_instance
.
getSpecialiseValue
(
portal_type
=
'Hosting Subscription'
)
...
...
master/bt5/slapos_cloud/bt/revision
View file @
5f4321c3
221
\ No newline at end of file
222
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment