|
|
@@ -80,11 +80,12 @@ def file_save(file_=None, file_path=None, prefix='img', ext='jpeg', watermark=Fa
|
80
|
80
|
os.path.join(settings.MEDIA_ROOT, photo_thumbnail2_path).replace('\\', '/'),
|
81
|
81
|
settings.THUMBNAIL_MAX_WIDTH2
|
82
|
82
|
)
|
83
|
|
- watermark_wrap(
|
84
|
|
- os.path.join(settings.MEDIA_ROOT, photo_thumbnail2_path).replace('\\', '/'),
|
85
|
|
- settings.WATERMARK_LOGO,
|
86
|
|
- os.path.join(settings.MEDIA_ROOT, photo_thumbnail2_path).replace('\\', '/')
|
87
|
|
- )
|
|
83
|
+ if watermark:
|
|
84
|
+ watermark_wrap(
|
|
85
|
+ os.path.join(settings.MEDIA_ROOT, photo_thumbnail2_path).replace('\\', '/'),
|
|
86
|
+ settings.WATERMARK_LOGO,
|
|
87
|
+ os.path.join(settings.MEDIA_ROOT, photo_thumbnail2_path).replace('\\', '/')
|
|
88
|
+ )
|
88
|
89
|
photo.photo_w = photo_w
|
89
|
90
|
photo.photo_h = photo_h
|
90
|
91
|
photo.photo_thumbnail2_path = photo_thumbnail2_path
|