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
Guillaume Hervier
slapos.core
Commits
0cdb3099
Commit
0cdb3099
authored
Sep 28, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup.
parent
be3bb91b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
7 deletions
+1
-7
master/product/Vifib/Tool/SlapTool.py
master/product/Vifib/Tool/SlapTool.py
+1
-7
No files found.
master/product/Vifib/Tool/SlapTool.py
View file @
0cdb3099
...
@@ -31,12 +31,10 @@
...
@@ -31,12 +31,10 @@
from
AccessControl
import
ClassSecurityInfo
from
AccessControl
import
ClassSecurityInfo
from
AccessControl
import
Unauthorized
from
AccessControl
import
Unauthorized
from
Products.ERP5Type.UnrestrictedMethod
import
UnrestrictedMethod
from
Products.ERP5Type.UnrestrictedMethod
import
UnrestrictedMethod
from
Products.ERP5Security.ERP5UserManager
import
SUPER_USER
from
OFS.Traversable
import
NotFound
from
OFS.Traversable
import
NotFound
from
Products.DCWorkflow.DCWorkflow
import
ValidationFailed
from
Products.DCWorkflow.DCWorkflow
import
ValidationFailed
from
Products.ERP5Type.Globals
import
InitializeClass
from
Products.ERP5Type.Globals
import
InitializeClass
from
Products.ERP5Type.Tool.BaseTool
import
BaseTool
from
Products.ERP5Type.Tool.BaseTool
import
BaseTool
from
Products.ZSQLCatalog.SQLCatalog
import
Query
,
ComplexQuery
from
Products.ERP5Type
import
Permissions
from
Products.ERP5Type
import
Permissions
from
Products.ERP5Type.Cache
import
CachingMethod
from
Products.ERP5Type.Cache
import
CachingMethod
from
Products.ERP5Type.Cache
import
DEFAULT_CACHE_SCOPE
from
Products.ERP5Type.Cache
import
DEFAULT_CACHE_SCOPE
...
@@ -148,9 +146,6 @@ class SlapTool(BaseTool):
...
@@ -148,9 +146,6 @@ class SlapTool(BaseTool):
.
getCachePluginList
()[
0
]
.
getCachePluginList
()[
0
]
def
_getCacheComputerInformation
(
self
,
computer_id
,
user
,
full
):
def
_getCacheComputerInformation
(
self
,
computer_id
,
user
,
full
):
user_document
=
self
.
getPortalObject
().
portal_catalog
.
getResultValue
(
reference
=
user
,
portal_type
=
[
'Person'
,
'Computer'
,
'Software Instance'
])
user_type
=
user_document
.
getPortalType
()
self
.
REQUEST
.
response
.
setHeader
(
'Content-Type'
,
'text/xml'
)
self
.
REQUEST
.
response
.
setHeader
(
'Content-Type'
,
'text/xml'
)
slap_computer
=
Computer
(
computer_id
)
slap_computer
=
Computer
(
computer_id
)
parent_uid
=
self
.
_getComputerUidByReference
(
computer_id
)
parent_uid
=
self
.
_getComputerUidByReference
(
computer_id
)
...
@@ -596,7 +591,7 @@ class SlapTool(BaseTool):
...
@@ -596,7 +591,7 @@ class SlapTool(BaseTool):
except
(
etree
.
XMLSyntaxError
,
etree
.
DocumentInvalid
)
as
e
:
except
(
etree
.
XMLSyntaxError
,
etree
.
DocumentInvalid
)
as
e
:
LOG
(
'SlapTool::_validateXML'
,
INFO
,
LOG
(
'SlapTool::_validateXML'
,
INFO
,
'Failed to parse this XML reports : %s
\
n
%s'
%
\
'Failed to parse this XML reports : %s
\
n
%s'
%
\
(
to_be_validated
,
_formatXMLError
(
e
)
))
(
to_be_validated
,
e
))
return
False
return
False
if
xmlschema
.
validate
(
document
):
if
xmlschema
.
validate
(
document
):
...
@@ -625,7 +620,6 @@ class SlapTool(BaseTool):
...
@@ -625,7 +620,6 @@ class SlapTool(BaseTool):
def
_getSlapPartitionByPackingList
(
self
,
computer_partition_document
):
def
_getSlapPartitionByPackingList
(
self
,
computer_partition_document
):
computer
=
computer_partition_document
computer
=
computer_partition_document
portal
=
self
.
getPortalObject
()
portal
=
self
.
getPortalObject
()
portal_preferences
=
portal
.
portal_preferences
while
computer
.
getPortalType
()
!=
'Computer'
:
while
computer
.
getPortalType
()
!=
'Computer'
:
computer
=
computer
.
getParentValue
()
computer
=
computer
.
getParentValue
()
computer_id
=
computer
.
getReference
()
computer_id
=
computer
.
getReference
()
...
...
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