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
137
Merge Requests
137
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
ada20d85
Commit
ada20d85
authored
Oct 24, 2019
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_document_scanner: Fix code
parent
e587e935
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/Base_storeDocumentFromCameraInActiveProcess.py
...nt_scanner/Base_storeDocumentFromCameraInActiveProcess.py
+4
-3
erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/Base_storeDocumentFromCameraInActiveProcess.xml
...t_scanner/Base_storeDocumentFromCameraInActiveProcess.xml
+1
-1
erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/Base_uploadDocumentFromCameraByActivity.py
...cument_scanner/Base_uploadDocumentFromCameraByActivity.py
+1
-1
erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/gadget_document_scanner.js.js
...skins/erp5_document_scanner/gadget_document_scanner.js.js
+1
-1
No files found.
erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/Base_storeDocumentFromCameraInActiveProcess.py
View file @
ada20d85
...
...
@@ -13,9 +13,12 @@ if not active_preference:
if
active_preference
and
preferred_cropped_canvas_data
:
active_preference
.
setPreferredCroppedCanvasData
(
preferred_cropped_canvas_data
)
if
active_process_url
:
active_process
=
portal
.
restrictedTraverse
(
active_process_url
)
if
not
image_str
:
if
batch_mode
:
return
None
return
active_process
return
context
.
Base_renderForm
(
'Base_viewUploadDocumentFromCameraDialog'
,
message
=
'Nothing to capture'
)
...
...
@@ -23,8 +26,6 @@ if not image_str:
if
not
active_process_url
:
active_process
=
portal
.
portal_activities
.
newActiveProcess
()
context
.
REQUEST
.
form
[
"your_active_process_url"
]
=
active_process
.
getRelativeUrl
()
else
:
active_process
=
portal
.
restrictedTraverse
(
active_process_url
)
active_process
.
postActiveResult
(
detail
=
image_str
)
context
.
REQUEST
.
form
.
pop
(
"field_your_document_scanner_gadget"
)
...
...
erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/Base_storeDocumentFromCameraInActiveProcess.xml
View file @
ada20d85
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
portal_type=None,
classification=None, synchronous_metadata_discovery=None, cancel_url=None, batch_mode=False, editable_mode=1, group=None, publication_section=None, document_scanner_gadget=None, active_process_url=None, **kw
</string>
</value>
<value>
<string>
classification=None, synchronous_metadata_discovery=None, cancel_url=None, batch_mode=False, editable_mode=1, group=None, publication_section=None, document_scanner_gadget=None, active_process_url=None, **kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/Base_uploadDocumentFromCameraByActivity.py
View file @
ada20d85
...
...
@@ -2,7 +2,7 @@ portal = context.getPortalObject()
translateString
=
portal
.
Base_translateString
active_process
=
context
.
Base_storeDocumentFromCameraInActiveProcess
(
active_process_url
,
active_process_url
=
active_process_url
,
batch_mode
=
True
,
**
kw
)
...
...
erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/gadget_document_scanner.js.js
View file @
ada20d85
...
...
@@ -237,7 +237,7 @@
);
dialogMethod
=
preferredCroppedCanvasData
.
dialog_method
;
// Clear photo input
//
element.querySelector('.photoInput').value = "";
element
.
querySelector
(
'
.photoInput
'
).
value
=
""
;
pageNumber
=
parseInt
(
element
.
querySelector
(
'
input[name="page-number"]
'
).
value
,
10
);
root
.
querySelector
(
"
.camera-input
"
).
style
.
display
=
""
;
root
.
querySelector
(
"
.camera-output
"
).
style
.
display
=
"
none
"
;
...
...
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