Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
144
Merge Requests
144
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
8048d29f
Commit
8048d29f
authored
Mar 04, 2020
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_document_scanner: Improve alarm's id and title
parent
a9f646ee
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
6 deletions
+9
-6
bt5/erp5_document_scanner/PathTemplateItem/portal_alarms/remove_outdated_document_scanner_active_processes.xml
...rms/remove_outdated_document_scanner_active_processes.xml
+2
-2
bt5/erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/Alarm_removeOutdatedActiveProcess.py
...rp5_document_scanner/Alarm_removeOutdatedActiveProcess.py
+5
-2
bt5/erp5_document_scanner/bt/template_path_list
bt5/erp5_document_scanner/bt/template_path_list
+1
-1
bt5/erp5_document_scanner_ui_test/TestTemplateItem/portal_components/test.erp5.testDocumentScanner.py
...teItem/portal_components/test.erp5.testDocumentScanner.py
+1
-1
No files found.
bt5/erp5_document_scanner/PathTemplateItem/portal_alarms/remove_outdated_
active_proces
s.xml
→
bt5/erp5_document_scanner/PathTemplateItem/portal_alarms/remove_outdated_
document_scanner_active_processe
s.xml
View file @
8048d29f
...
...
@@ -26,7 +26,7 @@
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
remove_outdated_
active_proces
s
</string>
</value>
<value>
<string>
remove_outdated_
document_scanner_active_processe
s
</string>
</value>
</item>
<item>
<key>
<string>
periodicity_day_frequency
</string>
</key>
...
...
@@ -87,7 +87,7 @@
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Remove Outdated
Active Proces
s
</string>
</value>
<value>
<string>
Remove Outdated
Document Scanner Active Processe
s
</string>
</value>
</item>
</dictionary>
</pickle>
...
...
bt5/erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/Alarm_removeOutdatedActiveProcess.py
View file @
8048d29f
from
Products.ZSQLCatalog.SQLCatalog
import
SimpleQuery
portal
=
context
.
getPortalObject
()
portal
.
portal_catalog
.
searchAndActivate
(
...
...
@@ -5,6 +7,7 @@ portal.portal_catalog.searchAndActivate(
method_id
=
'ActiveProcess_removeItselfFromActivityTool'
,
reference
=
context
.
Base_getDocumentScannerDefaultReference
(),
# Active Process don't have creation date set
modification_date
=
(
DateTime
()
-
4
).
earliestTime
(),
comparison_operator
=
"<"
modification_date
=
SimpleQuery
(
modification_date
=
(
DateTime
()
-
4
).
earliestTime
(),
comparison_operator
=
"<"
)
)
bt5/erp5_document_scanner/bt/template_path_list
View file @
8048d29f
portal_alarms/remove_outdated_
active_proces
s
portal_alarms/remove_outdated_
document_scanner_active_processe
s
web_page_module/rjs_gadget_document_scanner_css
web_page_module/rjs_gadget_document_scanner_html
web_page_module/rjs_gadget_document_scanner_js
\ No newline at end of file
bt5/erp5_document_scanner_ui_test/TestTemplateItem/portal_components/test.erp5.testDocumentScanner.py
View file @
8048d29f
...
...
@@ -73,6 +73,6 @@ class DocumentScanner(ERP5TypeTestCase):
req
(
"update catalog set modification_date='{date}' where uid={uid}"
.
format
(
date
=
(
DateTime
()
-
6
).
toZone
(
'UTC'
),
uid
=
active_process
.
getUid
()))
self
.
portal
.
portal_alarms
.
remove_outdated_
active_proces
s
.
activeSense
()
self
.
portal
.
portal_alarms
.
remove_outdated_
document_scanner_active_processe
s
.
activeSense
()
self
.
tic
()
self
.
assertNotIn
(
active_process
.
getId
(),
list
(
self
.
portal
.
portal_activities
.
objectIds
()))
\ 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