|
@@ -233,8 +233,6 @@ class SmartSceneView(View):
|
|
|
|
|
|
with transaction.atomic():
|
|
|
if not is_all_day or is_all_day == 1: # 不设置时间或全天
|
|
|
- if is_all_day == 1:
|
|
|
- smart_scene_dict['is_all_day'] = is_all_day
|
|
|
smart_scene_qs = SmartScene.objects.create(**smart_scene_dict)
|
|
|
elif is_all_day == 2:
|
|
|
# if is_all_day == '0':
|
|
@@ -249,8 +247,8 @@ class SmartSceneView(View):
|
|
|
start_time = int(request_dict.get('startTime', None))
|
|
|
end_time = int(request_dict.get('endTime', None))
|
|
|
repeat = int(request_dict.get('repeat', None))
|
|
|
- if not all([start_time, end_time, repeat]):
|
|
|
- return response.json(444, {'error param': 'startTime and endTime and repeat'})
|
|
|
+ # if not all([start_time, end_time, repeat]):
|
|
|
+ # return response.json(444, {'error param': 'startTime and endTime and repeat'})
|
|
|
effective_time_qs = EffectiveTime.objects.filter(start_time=start_time, end_time=end_time,
|
|
|
repeat=repeat).values('id')
|
|
|
if effective_time_qs.exists():
|
|
@@ -259,7 +257,6 @@ class SmartSceneView(View):
|
|
|
effective_time_id = EffectiveTime.objects.create(start_time=start_time, end_time=end_time,
|
|
|
repeat=repeat).id
|
|
|
smart_scene_dict['effective_time_id'] = effective_time_id
|
|
|
- smart_scene_dict['is_all_day'] = is_all_day
|
|
|
smart_scene_qs = SmartScene.objects.create(**smart_scene_dict)
|
|
|
else:
|
|
|
return response.json(444, {'error param': 'invalid isAllDay'})
|