|
|
@@ -387,7 +387,7 @@ class CloudStorageView(View):
|
|
|
"Effect": "Allow",
|
|
|
"Action": "s3:*",
|
|
|
"Resource": ["{aws_arn}:::{bucket_name}/{uid_channel}*".
|
|
|
- format(aws_arn=aws_arn, bucket_name=bucket_name, uid_channel=storage)]
|
|
|
+ format(aws_arn=aws_arn, bucket_name=bucket_name, uid_channel=storage)]
|
|
|
}
|
|
|
]
|
|
|
}
|
|
|
@@ -1588,13 +1588,14 @@ class CloudStorageView(View):
|
|
|
}
|
|
|
store_list.append(unused_dict)
|
|
|
bucket_id_list.append(ub['bucket__id'])
|
|
|
- smqs = Store_Meal.objects.filter(bucket__id__in=bucket_id_list, lang__lang=lang).values('lang__lang',
|
|
|
- 'bucket__id',
|
|
|
- 'lang__title')
|
|
|
+ smqs = Store_Meal.objects.filter(bucket__id__in=bucket_id_list, lang__lang=lang).annotate(
|
|
|
+ title=F('lang__title'), content=F('lang__content')).values('lang__content', 'lang__lang',
|
|
|
+ 'bucket__id',
|
|
|
+ 'lang__title')
|
|
|
for index, value in enumerate(store_list):
|
|
|
for sm in smqs:
|
|
|
if value['bucket__id'] == sm['bucket__id']:
|
|
|
- value['bucket__content'] = sm['lang__title']
|
|
|
+ value['bucket__content'] = sm['lang__title'] + '-' + sm['lang__content']
|
|
|
|
|
|
return response.json(0, list(store_list))
|
|
|
|
