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
7
Merge Requests
7
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
Jérome Perrin
erp5
Commits
cd778eec
Commit
cd778eec
authored
Aug 21, 2015
by
root
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
production changes
parent
a62a8f40
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
product/ERP5/Document/Image.py
product/ERP5/Document/Image.py
+1
-1
product/ERP5/__init__.py
product/ERP5/__init__.py
+1
-1
product/ZSQLCatalog/SQLCatalog.py
product/ZSQLCatalog/SQLCatalog.py
+1
-0
No files found.
product/ERP5/Document/Image.py
View file @
cd778eec
...
...
@@ -319,7 +319,7 @@ class Image(TextConvertableMixin, File, OFSImage):
def
_resize
(
self
,
quality
,
width
,
height
,
format
,
resolution
,
frame
):
"""Resize and resample photo."""
parameter_list
=
[
'convert'
,
'-colorspace'
,
'sRGB'
,
'-depth'
,
'8'
,
parameter_list
=
[
'
/usr/bin/timeout'
,
'10'
,
'
convert'
,
'-colorspace'
,
'sRGB'
,
'-depth'
,
'8'
,
'-quality'
,
str
(
quality
),
'-geometry'
,
'%sx%s'
%
(
width
,
height
)]
if
format
not
in
VALID_TRANSPARENT_IMAGE_FORMAT_LIST
:
...
...
product/ERP5/__init__.py
View file @
cd778eec
...
...
@@ -125,6 +125,6 @@ except ImportError:
class
pyPdfGeneric
:
NameObject
=
type
(
'NameObject'
,
(
str
,
),
{
'__module__'
:
'pyPdf.Generic'
})
sys
.
modules
[
'pyPdf.
G
eneric'
]
=
pyPdfGeneric
sys
.
modules
[
'pyPdf.
g
eneric'
]
=
pyPdfGeneric
sys
.
modules
[
'pyPdf'
]
=
pyPdfGeneric
product/ZSQLCatalog/SQLCatalog.py
View file @
cd778eec
...
...
@@ -1018,6 +1018,7 @@ class Catalog(Folder,
# It could also have a performance impact for traversals to objects in
# the acquisition context on Zope 2.12 even when it didn't raise a weird
# error.
if
not
uid
:
return
None
method
=
getattr
(
self
,
self
.
sql_getitem_by_uid
)
search_result
=
method
(
uid
=
uid
)
if
len
(
search_result
)
>
0
:
...
...
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