:art: Solve Conflict
huangqimin001
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
+ 2
- 2
api/admin_views.py
@@ -1032,7 +1032,7 @@ def member_activity_update(request): |
||
| 1032 | 1032 |
location = request.POST.get('location', '')
|
| 1033 | 1033 |
integral = int(request.POST.get('integral', 0))
|
| 1034 | 1034 |
is_slider = request.POST.get('is_slider', 0)
|
| 1035 |
- slider_image_path = request.POST.get('banner_path', '')
|
|
| 1035 |
+ slider_image_path = request.POST.get('banner_path', '') or request.POST.get('slider_image_path', '')
|
|
| 1036 | 1036 |
cover_path = request.POST.get('cover_path', '')
|
| 1037 | 1037 |
# image_path = request.POST.get('image_path', '') or request.POST.get('banner_path', '')
|
| 1038 | 1038 |
limit_image_num = int(request.POST.get('limit_image_num', 3))
|
@@ -1097,7 +1097,7 @@ def member_activity_create(request): |
||
| 1097 | 1097 |
location = request.POST.get('location', '')
|
| 1098 | 1098 |
integral = int(request.POST.get('integral', 0))
|
| 1099 | 1099 |
is_slider = request.POST.get('is_slider', 0)
|
| 1100 |
- slider_image_path = request.POST.get('banner_path', '')
|
|
| 1100 |
+ slider_image_path = request.POST.get('banner_path', '') or request.POST.get('slider_image_path', '')
|
|
| 1101 | 1101 |
cover_path = request.POST.get('cover_path', '')
|
| 1102 | 1102 |
# image_path = request.POST.get('image_path', '') or request.POST.get('banner_path', '')
|
| 1103 | 1103 |
limit_image_num = int(request.POST.get('limit_image_num', 3))
|