|
|
@@ -406,12 +406,20 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):
|
406
|
406
|
return '%d' % self.pk
|
407
|
407
|
|
408
|
408
|
@property
|
|
409
|
+ def final_is_upload_qiniu(self):
|
|
410
|
+ if settings.FILE_URL_TYPE == 'QINIU':
|
|
411
|
+ return True
|
|
412
|
+ elif settings.FILE_URL_TYPE == 'SERVER':
|
|
413
|
+ return False
|
|
414
|
+ return self.is_upload_qiniu
|
|
415
|
+
|
|
416
|
+ @property
|
409
|
417
|
def slider_image_path(self):
|
410
|
418
|
return upload_file_path(self.slider_image)
|
411
|
419
|
|
412
|
420
|
@property
|
413
|
421
|
def slider_image_url(self):
|
414
|
|
- return qiniu_file_url(self.slider_image.name, bucket='tamron') if self.is_upload_qiniu else upload_file_url(self.slider_image)
|
|
422
|
+ return qiniu_file_url(self.slider_image.name, bucket='tamron') if self.final_is_upload_qiniu else upload_file_url(self.slider_image)
|
415
|
423
|
|
416
|
424
|
@property
|
417
|
425
|
def cover_path(self):
|
|
|
@@ -419,7 +427,7 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):
|
419
|
427
|
|
420
|
428
|
@property
|
421
|
429
|
def cover_url(self):
|
422
|
|
- return qiniu_file_url(self.cover.name, bucket='tamron') if self.is_upload_qiniu else upload_file_url(self.cover)
|
|
430
|
+ return qiniu_file_url(self.cover.name, bucket='tamron') if self.final_is_upload_qiniu else upload_file_url(self.cover)
|
423
|
431
|
|
424
|
432
|
# @property
|
425
|
433
|
# def image_path(self):
|