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
Labels
Merge Requests
21
Merge Requests
21
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
2eb77cb9
Commit
2eb77cb9
authored
Jul 29, 2017
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
master: Compatibility with operator was dropped from catalog
Reference commit
nexedi/erp5@455b24e5
parent
ff951e30
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
...ting/OrderBuilder_generateSlapOSAggregatedMovementList.py
+1
-1
master/product/SlapOS/SlapOSMachineAuthenticationPlugin.py
master/product/SlapOS/SlapOSMachineAuthenticationPlugin.py
+1
-1
master/product/SlapOS/SlapOSShadowAuthenticationPlugin.py
master/product/SlapOS/SlapOSShadowAuthenticationPlugin.py
+1
-1
master/product/Vifib/tests/testVifibSlapWebService.py
master/product/Vifib/tests/testVifibSlapWebService.py
+3
-3
No files found.
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
View file @
2eb77cb9
...
@@ -20,7 +20,7 @@ select_kw.update(
...
@@ -20,7 +20,7 @@ select_kw.update(
select_dict
=
select_dict
,
select_dict
=
select_dict
,
left_join_list
=
select_dict
.
keys
(),
left_join_list
=
select_dict
.
keys
(),
default_aggregate_portal_type
=
ComplexQuery
(
NegatedQuery
(
Query
(
default_aggregate_portal_type
=
'Computer'
)),
default_aggregate_portal_type
=
ComplexQuery
(
NegatedQuery
(
Query
(
default_aggregate_portal_type
=
'Computer'
)),
Query
(
default_aggregate_portal_type
=
None
),
operator
=
"OR"
),
Query
(
default_aggregate_portal_type
=
None
),
logical_
operator
=
"OR"
),
grouping_reference
=
None
,
grouping_reference
=
None
,
sort_on
=
((
'modification_date'
,
'ASC'
),)
# the highest chance to find movement which can be delivered
sort_on
=
((
'modification_date'
,
'ASC'
),)
# the highest chance to find movement which can be delivered
)
)
...
...
master/product/SlapOS/SlapOSMachineAuthenticationPlugin.py
View file @
2eb77cb9
...
@@ -79,7 +79,7 @@ def getUserByLogin(portal, login):
...
@@ -79,7 +79,7 @@ def getUserByLogin(portal, login):
person_query
=
Query
(
portal_type
=
[
"Person"
],
person_query
=
Query
(
portal_type
=
[
"Person"
],
reference
=
dict
(
query
=
login
,
key
=
'ExactMatch'
))
reference
=
dict
(
query
=
login
,
key
=
'ExactMatch'
))
result
=
portal
.
portal_catalog
.
unrestrictedSearchResults
(
result
=
portal
.
portal_catalog
.
unrestrictedSearchResults
(
query
=
ComplexQuery
(
machine_query
,
person_query
,
operator
=
"OR"
),
query
=
ComplexQuery
(
machine_query
,
person_query
,
logical_
operator
=
"OR"
),
select_expression
=
'reference'
)
select_expression
=
'reference'
)
result
=
[
x
for
x
in
result
if
\
result
=
[
x
for
x
in
result
if
\
(
x
.
getPortalType
()
==
'Person'
and
x
.
getValidationState
()
!=
'deleted'
)
or
\
(
x
.
getPortalType
()
==
'Person'
and
x
.
getValidationState
()
!=
'deleted'
)
or
\
...
...
master/product/SlapOS/SlapOSShadowAuthenticationPlugin.py
View file @
2eb77cb9
...
@@ -90,7 +90,7 @@ def getUserByLogin(portal, login):
...
@@ -90,7 +90,7 @@ def getUserByLogin(portal, login):
person_query
=
Query
(
portal_type
=
[
"Person"
],
person_query
=
Query
(
portal_type
=
[
"Person"
],
reference
=
dict
(
query
=
login
,
key
=
'ExactMatch'
))
reference
=
dict
(
query
=
login
,
key
=
'ExactMatch'
))
result
=
portal
.
portal_catalog
.
unrestrictedSearchResults
(
result
=
portal
.
portal_catalog
.
unrestrictedSearchResults
(
query
=
ComplexQuery
(
machine_query
,
person_query
,
operator
=
"OR"
),
query
=
ComplexQuery
(
machine_query
,
person_query
,
logical_
operator
=
"OR"
),
select_expression
=
'reference'
)
select_expression
=
'reference'
)
result
=
[
x
for
x
in
result
if
\
result
=
[
x
for
x
in
result
if
\
(
x
.
getPortalType
()
==
'Person'
and
x
.
getValidationState
()
!=
'deleted'
)
or
\
(
x
.
getPortalType
()
==
'Person'
and
x
.
getValidationState
()
!=
'deleted'
)
or
\
...
...
master/product/Vifib/tests/testVifibSlapWebService.py
View file @
2eb77cb9
...
@@ -533,7 +533,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
...
@@ -533,7 +533,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
default_aggregate_uid
=
ComplexQuery
(
default_aggregate_uid
=
ComplexQuery
(
Query
(
default_aggregate_uid
=
sequence
[
'computer_partition_uid'
]),
Query
(
default_aggregate_uid
=
sequence
[
'computer_partition_uid'
]),
Query
(
default_aggregate_uid
=
sequence
[
'software_instance_uid'
]),
Query
(
default_aggregate_uid
=
sequence
[
'software_instance_uid'
]),
operator
=
"AND"
),
logical_
operator
=
"AND"
),
portal_type
=
self
.
sale_packing_list_line_portal_type
,
portal_type
=
self
.
sale_packing_list_line_portal_type
,
simulation_state
=
state
,
simulation_state
=
state
,
resource_relative_url
=
resource
)[
0
][
0
])
resource_relative_url
=
resource
)[
0
][
0
])
...
@@ -2834,7 +2834,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
...
@@ -2834,7 +2834,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
query
=
ComplexQuery
(
query
=
ComplexQuery
(
Query
(
aggregate_uid
=
sequence
[
'computer_partition_uid'
]),
Query
(
aggregate_uid
=
sequence
[
'computer_partition_uid'
]),
Query
(
aggregate_portal_type
=
self
.
software_instance_portal_type
),
Query
(
aggregate_portal_type
=
self
.
software_instance_portal_type
),
operator
=
"AND"
)
logical_
operator
=
"AND"
)
software_instance
=
self
.
portal
.
portal_catalog
.
getResultValue
(
software_instance
=
self
.
portal
.
portal_catalog
.
getResultValue
(
portal_type
=
"Sale Packing List Line"
,
portal_type
=
"Sale Packing List Line"
,
sort_on
=
((
'movement.start_date'
,
'DESC'
),),
sort_on
=
((
'movement.start_date'
,
'DESC'
),),
...
@@ -2845,7 +2845,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
...
@@ -2845,7 +2845,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
query
=
ComplexQuery
(
query
=
ComplexQuery
(
Query
(
aggregate_uid
=
sequence
[
'computer_partition_uid'
]),
Query
(
aggregate_uid
=
sequence
[
'computer_partition_uid'
]),
Query
(
aggregate_portal_type
=
self
.
slave_instance_portal_type
),
Query
(
aggregate_portal_type
=
self
.
slave_instance_portal_type
),
operator
=
"AND"
)
logical_
operator
=
"AND"
)
slave_instance
=
self
.
portal
.
portal_catalog
.
getResultValue
(
slave_instance
=
self
.
portal
.
portal_catalog
.
getResultValue
(
portal_type
=
"Sale Packing List Line"
,
portal_type
=
"Sale Packing List Line"
,
query
=
query
).
getAggregateValue
(
portal_type
=
self
.
slave_instance_portal_type
)
query
=
query
).
getAggregateValue
(
portal_type
=
self
.
slave_instance_portal_type
)
...
...
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