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
1
Merge Requests
1
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
Romain Courteaud
slapos.core
Commits
f47e8f4e
Commit
f47e8f4e
authored
Feb 01, 2023
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
master: Fix grammar
See merge request
nexedi/slapos.core!485
parents
9465e76b
8dbdd176
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
13 deletions
+13
-13
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSAccountingBuilder.py
...ortal_components/test.erp5.testSlapOSAccountingBuilder.py
+6
-6
master/bt5/slapos_crm/PathTemplateItem/portal_alarms/slapos_crm_check_instance_in_error.xml
...Item/portal_alarms/slapos_crm_check_instance_in_error.xml
+2
-2
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/ComputeNode_checkState.py
...tal_skins/slapos_crm_monitoring/ComputeNode_checkState.py
+1
-1
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_regularisation_request_view_js.js
...s_gadget_erp5_page_slap_regularisation_request_view_js.js
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_ticket_view_js.js
...b_page_module/rjs_gadget_erp5_page_slap_ticket_view_js.js
+2
-2
No files found.
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSAccountingBuilder.py
View file @
f47e8f4e
...
...
@@ -188,7 +188,7 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder):
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
delivery_1
,
'delivered'
)
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
delivery_1
,
'calculating'
)
if
delivery_1
.
getCausalityState
()
==
'draft'
:
# There are more th
em
one workflow that has calculating state
# There are more th
an
one workflow that has calculating state
delivery_1
.
startBuilding
()
delivery_line_1
=
delivery_1
.
newContent
(
...
...
@@ -221,7 +221,7 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder):
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
delivery_2
,
'delivered'
)
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
delivery_2
,
'calculating'
)
if
delivery_2
.
getCausalityState
()
==
'draft'
:
# There are more th
em
one workflow that has calculating state
# There are more th
an
one workflow that has calculating state
delivery_2
.
startBuilding
()
delivery_line_2
=
delivery_2
.
newContent
(
...
...
@@ -494,7 +494,7 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder):
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
delivery_1
,
'delivered'
)
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
delivery_1
,
'calculating'
)
if
delivery_1
.
getCausalityState
()
==
'draft'
:
# There are more th
em
one workflow that has calculating state
# There are more th
an
one workflow that has calculating state
delivery_1
.
startBuilding
()
delivery_line_1
=
delivery_1
.
newContent
(
...
...
@@ -527,7 +527,7 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder):
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
delivery_2
,
'delivered'
)
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
delivery_2
,
'calculating'
)
if
delivery_2
.
getCausalityState
()
==
'draft'
:
# There are more th
em
one workflow that has calculating state
# There are more th
an
one workflow that has calculating state
delivery_2
.
startBuilding
()
delivery_line_2
=
delivery_2
.
newContent
(
...
...
@@ -764,7 +764,7 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder):
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
delivery_1
,
'delivered'
)
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
delivery_1
,
'calculating'
)
if
delivery_1
.
getCausalityState
()
==
'draft'
:
# There are more th
em
one workflow that has calculating state
# There are more th
an
one workflow that has calculating state
delivery_1
.
startBuilding
()
delivery_line_1
=
delivery_1
.
newContent
(
...
...
@@ -796,7 +796,7 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder):
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
delivery_2
,
'delivered'
)
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
delivery_2
,
'calculating'
)
if
delivery_2
.
getCausalityState
()
==
'draft'
:
# There are more th
em
one workflow that has calculating state
# There are more th
an
one workflow that has calculating state
delivery_2
.
startBuilding
()
delivery_line_2
=
delivery_2
.
newContent
(
...
...
master/bt5/slapos_crm/PathTemplateItem/portal_alarms/slapos_crm_check_instance_in_error.xml
View file @
f47e8f4e
...
...
@@ -12,7 +12,7 @@
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string>
Check and create a Ticket when an instance is partially allocated for more th
em
4 hours.
</string>
</value>
<value>
<string>
Check and create a Ticket when an instance is partially allocated for more th
an
4 hours.
</string>
</value>
</item>
<item>
<key>
<string>
enabled
</string>
</key>
...
...
@@ -93,7 +93,7 @@
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Check partially allocated Instance for more th
em
4 hours
</string>
</value>
<value>
<string>
Check partially allocated Instance for more th
an
4 hours
</string>
</value>
</item>
</dictionary>
</pickle>
...
...
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/ComputeNode_checkState.py
View file @
f47e8f4e
...
...
@@ -75,7 +75,7 @@ if not should_notify:
break
if
should_notify
:
description
=
"The Compute Node %s (%s) didnt process its instances for more th
em
24 hours, last contact: %s"
%
(
description
=
"The Compute Node %s (%s) didnt process its instances for more th
an
24 hours, last contact: %s"
%
(
context
.
getTitle
(),
context
.
getReference
(),
last_contact
)
if
should_notify
:
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_regularisation_request_view_js.js
View file @
f47e8f4e
...
...
@@ -26,7 +26,7 @@
.
allowPublicAcquisition
(
"
jio_allDocs
"
,
function
(
param_list
)
{
var
gadget
=
this
;
// This code can cause problems if it is used more th
em
once per
// This code can cause problems if it is used more th
an
once per
// page
param_list
[
0
].
sort_on
=
[[
"
modification_date
"
,
"
ascending
"
]];
param_list
[
0
].
select_list
=
[
"
uid
"
,
"
title
"
,
"
text_content
"
,
...
...
@@ -253,4 +253,4 @@
return
gadget
.
updateHeader
(
header_dict
);
});
});
}(
window
,
rJS
,
RSVP
));
\ No newline at end of file
}(
window
,
rJS
,
RSVP
));
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_ticket_view_js.js
View file @
f47e8f4e
...
...
@@ -26,7 +26,7 @@
.
allowPublicAcquisition
(
"
jio_allDocs
"
,
function
(
param_list
)
{
var
gadget
=
this
;
// This code can cause problems if it is used more th
em
once per
// This code can cause problems if it is used more th
an
once per
// page
param_list
[
0
].
sort_on
=
[[
"
modification_date
"
,
"
ascending
"
]];
param_list
[
0
].
select_list
=
[
"
uid
"
,
"
title
"
,
"
text_content
"
,
...
...
@@ -255,4 +255,4 @@
return
gadget
.
updateHeader
(
header_dict
);
});
});
}(
window
,
rJS
,
RSVP
));
\ No newline at end of file
}(
window
,
rJS
,
RSVP
));
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