Skip to content

Commit b9dfe58

Browse files
szabozoltan69szabozoltan69
authored
Merge pull request #1520 from IFRCGo/develop
Release 6.3.0
2 parents ec8c9d4 + ec267c6 commit b9dfe58

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+3536
-1048
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
66

77
## Unreleased
88

9+
## 1.1.453
10+
11+
### Added
12+
- Hiding Annual Figures input temporarily
13+
914
## 1.1.452
1015

1116
### Added
@@ -2038,7 +2043,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
20382043

20392044
## 0.1.20
20402045

2041-
[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.452...HEAD
2046+
[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.453...HEAD
2047+
[1.1.453]: https://github.com/IFRCGo/go-api/compare/1.1.452...1.1.453
20422048
[1.1.452]: https://github.com/IFRCGo/go-api/compare/1.1.451...1.1.452
20432049
[1.1.451]: https://github.com/IFRCGo/go-api/compare/1.1.450...1.1.451
20442050
[1.1.450]: https://github.com/IFRCGo/go-api/compare/1.1.449...1.1.450

‎api/migrations/0157_event_image_and_summary_translations.py‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Generated by Django 2.2.27 on 2022-09-06 09:46
2+
3+
import api.models
4+
from django.db import migrations, models
5+
import tinymce.models
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
dependencies = [
11+
('api', '0156_appealfilter_comment'),
12+
]
13+
14+
operations = [
15+
migrations.AddField(
16+
model_name='event',
17+
name='image',
18+
field=models.ImageField(blank=True, null=True, upload_to=api.models.snippet_image_path, verbose_name='image'),
19+
),
20+
migrations.AddField(
21+
model_name='event',
22+
name='summary_ar',
23+
field=tinymce.models.HTMLField(blank=True, default='', null=True, verbose_name='summary'),
24+
),
25+
migrations.AddField(
26+
model_name='event',
27+
name='summary_en',
28+
field=tinymce.models.HTMLField(blank=True, default='', null=True, verbose_name='summary'),
29+
),
30+
migrations.AddField(
31+
model_name='event',
32+
name='summary_es',
33+
field=tinymce.models.HTMLField(blank=True, default='', null=True, verbose_name='summary'),
34+
),
35+
migrations.AddField(
36+
model_name='event',
37+
name='summary_fr',
38+
field=tinymce.models.HTMLField(blank=True, default='', null=True, verbose_name='summary'),
39+
),
40+
]

‎api/models.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,10 @@ class Labels:
564564
RED = _('Red')
565565

566566

567+
def snippet_image_path(instance, filename):
568+
return 'emergencies/%s/%s' % (instance.id, filename)
569+
570+
567571
@reversion.register()
568572
class Event(models.Model):
569573
""" A disaster, which could cover multiple countries """
@@ -594,6 +598,7 @@ class Event(models.Model):
594598
' etc to point to the parent Emergency manually.'
595599
)
596600
)
601+
image = models.ImageField(verbose_name=_('image'), null=True, blank=True, upload_to=snippet_image_path)
597602
summary = HTMLField(verbose_name=_('summary'), blank=True, default='')
598603

599604
num_injured = models.IntegerField(verbose_name=_('number of injured'), null=True, blank=True)
@@ -772,10 +777,6 @@ class Meta:
772777
ordering = ('id',)
773778

774779

775-
def snippet_image_path(instance, filename):
776-
return 'emergencies/%s/%s' % (instance.event.id, filename)
777-
778-
779780
@reversion.register()
780781
class Snippet(models.Model):
781782
""" Snippet of text """

‎api/receivers.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ def create_global_reversion_log(versions, revision):
8989
changes_from = []
9090
changes_to = []
9191
for key, value in version._local_field_dict.items():
92+
if key not in previous_version._local_field_dict:
93+
previous_version._local_field_dict[key] = ''
9294
if previous_version._local_field_dict[key] != value:
9395
changes_from.append('{}: {}'.format(key, previous_version._local_field_dict[key]))
9496
changes_to.append('{}: {}'.format(key, value))

‎api/snapshots/snap_test_views.py‎

Lines changed: 122 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -8,156 +8,140 @@
88
snapshots = Snapshot()
99

1010
snapshots['EventSnaphostTest::test_event_featured_document_api 1'] = {
11-
'appeals': [
12-
],
13-
'auto_generated': False,
14-
'contacts': [
15-
],
16-
'countries': [
17-
],
18-
'countries_for_preview': [
19-
],
20-
'created_at': '2008-01-01T00:00:00.123456Z',
21-
'disaster_start_date': '2022-09-08T13:17:29.218728Z',
22-
'districts': [
23-
],
24-
'dtype': 1,
25-
'emergency_response_contact_email': None,
26-
'featured_documents': [
27-
{
28-
'description': 'event-featured-document-description-IPdHceQdWaAiOoeTjanGDxdNOQNEQFbaIJAabHUrIsbGSRBZlggHjpmNHqwrYzfxzDKpSotRfPPWcfzyyJEdOaSkfFBPYvKgHcon',
29-
'file': None,
30-
'id': 5,
31-
'thumbnail': None,
32-
'title': 'event-featured-document-title-EWunxuAcKoVjbqJLLUAsjmvoyKpFJPRvqWFUPVFDkUYwkiUIFl'
33-
},
34-
{
35-
'description': 'event-featured-document-description-JFdwPQyYHuSAAjtylWIEpotTjZDdJAAJHiypqnvPfCxfIUmdryRMMcemZWLUQJnEnvtanmVhVWEpSMTnzpJuXsyDIPwtqxGFDgZU',
36-
'file': None,
37-
'id': 4,
38-
'thumbnail': None,
39-
'title': 'event-featured-document-title-negMcCMRTdpVczCoInWXdiGsoUKuKMXRuptjQHoAtrdJLVlORB'
40-
},
41-
{
42-
'description': 'event-featured-document-description-RnTLFfGCZdDiGADKdJDRZtUbzqaVnLecBwSeIdeEcsAlXiXPUPAxyCyyfRQIiPwhlIzHiUoaWbtDRUIBIyopDwjrmUWhcZQANXbp',
43-
'file': None,
44-
'id': 3,
45-
'thumbnail': None,
46-
'title': 'event-featured-document-title-hOsxNooiEjDVMxASJEWIZQnWpRWMYfHCHTxeKhdJGmKIjkuHCh'
47-
},
48-
{
49-
'description': 'event-featured-document-description-KoIVUclAlczYFlVscatKMgvsDPIHFiGDrmZhvkUDPqTlaVvYsKRWmlNOzBGufzQgliEupaqypCWrvtLUKaqPxSpdQhDtkzRGTXtS',
50-
'file': None,
51-
'id': 2,
52-
'thumbnail': None,
53-
'title': 'event-featured-document-title-VEnmIrJSrigNVLppdQHoOodgAvTEgRXiaJkAPEEPmWsusPdXfP'
54-
},
55-
{
56-
'description': 'event-featured-document-description-EkHOUNXyjRpcKShmbCuAjASnAGXNEVUdTiHnJuQEHyulDIvIwRXURPZSqNEmprJtotXsTnSTFuEwJYUrshKRIyzwXZjscsTfwCPq',
57-
'file': None,
58-
'id': 1,
59-
'thumbnail': None,
60-
'title': 'event-featured-document-title-EHDjMGiuNukzNVtLvGGIFTKtEbxvRhALtYUSObMEqPYXLKoUdL'
61-
}
62-
],
63-
'field_reports': [
64-
],
65-
'glide': 'JKxDZJiNfetzTUEHAX',
66-
'hide_attached_field_reports': True,
67-
'hide_field_report_map': True,
68-
'id': 2,
69-
'ifrc_severity_level': 1,
70-
'ifrc_severity_level_display': 'Orange',
71-
'is_featured': True,
72-
'is_featured_region': True,
73-
'key_figures': [
74-
],
75-
'links': [
76-
],
77-
'name': 'event-OhbVrpoiVgRVIfLBcbfnoGMbJmTPSIAoCLrZaWZkSBvrjnWvgf',
78-
'num_affected': 0,
79-
'parent_event': 1,
80-
'response_activity_count': 0,
81-
'slug': 'ygwwmqzcudihyfjsonxkmtecqoxsfogyrdoxkxwnqrsrpemoki',
82-
'summary': 'MGyDLJYVcCZKPmuMEGjdCgZvTfGPlcpTCCHHNkxxsyAXvRMdYOPvevgJRysqUQMjvfLQjwtPSQziMTftJyPYviQSVRHfPQBGxbxtlnvXFmoijesYgGXIVHcQvXNiMyjklSXNZkUCcAxRUpCNsWVYCoIptZYEmxRKCDXsXyGHAkmZMiqdPExJgTHhsfWkrCGjBfoCwbAdzGxpyfxobugTPvYjicsESiWTECNafbqnjJUMHBhXspthdpAOYNDehFMIbOGKpTjsBaNwpKAlQQfHxeHIGYGJbyEcOyxqVbwYewpUQOgXLVWvicwIvPlXRDSEOlZieTXDcsmcYmcutGzIEqcWPmswXdPvrhZxBzVCyvlFSFxZHrZfUBfBMlIsugfuQstCMTBkSCwCcUwNBrOYdeQOzxGZVRkbjMRYCciepXPxxyKcMjRCxxCWeKiHxzuPrphbVlFHyJhqXqTCnNsSFmhieClTCfZRuQwTeJIstkTTSOlYxGoh',
83-
'tab_one_title': 'PXKqPnXKANObFOIsPtEpZZRztDeSdkCAEDnvMjuTuUwziWxGJg',
84-
'tab_three_title': 'BiqUxWzxczdKJmxJseyGCWJrNRNhigzxYvJxWjmMGzGccciTvZ',
85-
'tab_two_title': 'upDhrCpjgdsyNApkuKUumWkFGDFtFbfzGDpnLwddsFMPREsIag',
86-
'updated_at': '2008-01-01T00:00:00.123456Z',
87-
'visibility': 3
11+
"dtype": 1,
12+
"countries": [],
13+
"districts": [],
14+
"summary": "MGyDLJYVcCZKPmuMEGjdCgZvTfGPlcpTCCHHNkxxsyAXvRMdYOPvevgJRysqUQMjvfLQjwtPSQziMTftJyPYviQSVRHfPQBGxbxtlnvXFmoijesYgGXIVHcQvXNiMyjklSXNZkUCcAxRUpCNsWVYCoIptZYEmxRKCDXsXyGHAkmZMiqdPExJgTHhsfWkrCGjBfoCwbAdzGxpyfxobugTPvYjicsESiWTECNafbqnjJUMHBhXspthdpAOYNDehFMIbOGKpTjsBaNwpKAlQQfHxeHIGYGJbyEcOyxqVbwYewpUQOgXLVWvicwIvPlXRDSEOlZieTXDcsmcYmcutGzIEqcWPmswXdPvrhZxBzVCyvlFSFxZHrZfUBfBMlIsugfuQstCMTBkSCwCcUwNBrOYdeQOzxGZVRkbjMRYCciepXPxxyKcMjRCxxCWeKiHxzuPrphbVlFHyJhqXqTCnNsSFmhieClTCfZRuQwTeJIstkTTSOlYxGoh",
15+
"num_affected": 0,
16+
"tab_two_title": "upDhrCpjgdsyNApkuKUumWkFGDFtFbfzGDpnLwddsFMPREsIag",
17+
"tab_three_title": "BiqUxWzxczdKJmxJseyGCWJrNRNhigzxYvJxWjmMGzGccciTvZ",
18+
"disaster_start_date": "2022-09-08T13:17:29.218728Z",
19+
"created_at": "2008-01-01T00:00:00.123456Z",
20+
"auto_generated": False,
21+
"appeals": [],
22+
"contacts": [],
23+
"key_figures": [],
24+
"is_featured": True,
25+
"is_featured_region": True,
26+
"field_reports": [],
27+
"hide_attached_field_reports": True,
28+
"hide_field_report_map": True,
29+
"updated_at": "2008-01-01T00:00:00.123456Z",
30+
"id": 2,
31+
"tab_one_title": "PXKqPnXKANObFOIsPtEpZZRztDeSdkCAEDnvMjuTuUwziWxGJg",
32+
"ifrc_severity_level": 1,
33+
"ifrc_severity_level_display": "Orange",
34+
"parent_event": 1,
35+
"glide": "JKxDZJiNfetzTUEHAX",
36+
"featured_documents": [
37+
{
38+
"id": 5,
39+
"thumbnail": None,
40+
"file": None,
41+
"title": "event-featured-document-title-EWunxuAcKoVjbqJLLUAsjmvoyKpFJPRvqWFUPVFDkUYwkiUIFl",
42+
"description": "event-featured-document-description-IPdHceQdWaAiOoeTjanGDxdNOQNEQFbaIJAabHUrIsbGSRBZlggHjpmNHqwrYzfxzDKpSotRfPPWcfzyyJEdOaSkfFBPYvKgHcon"
43+
},
44+
{
45+
"id": 4,
46+
"thumbnail": None,
47+
"file": None,
48+
"title": "event-featured-document-title-negMcCMRTdpVczCoInWXdiGsoUKuKMXRuptjQHoAtrdJLVlORB",
49+
"description": "event-featured-document-description-JFdwPQyYHuSAAjtylWIEpotTjZDdJAAJHiypqnvPfCxfIUmdryRMMcemZWLUQJnEnvtanmVhVWEpSMTnzpJuXsyDIPwtqxGFDgZU"
50+
},
51+
{
52+
"id": 3,
53+
"thumbnail": None,
54+
"file": None,
55+
"title": "event-featured-document-title-hOsxNooiEjDVMxASJEWIZQnWpRWMYfHCHTxeKhdJGmKIjkuHCh",
56+
"description": "event-featured-document-description-RnTLFfGCZdDiGADKdJDRZtUbzqaVnLecBwSeIdeEcsAlXiXPUPAxyCyyfRQIiPwhlIzHiUoaWbtDRUIBIyopDwjrmUWhcZQANXbp"
57+
},
58+
{
59+
"id": 2,
60+
"thumbnail": None,
61+
"file": None,
62+
"title": "event-featured-document-title-VEnmIrJSrigNVLppdQHoOodgAvTEgRXiaJkAPEEPmWsusPdXfP",
63+
"description": "event-featured-document-description-KoIVUclAlczYFlVscatKMgvsDPIHFiGDrmZhvkUDPqTlaVvYsKRWmlNOzBGufzQgliEupaqypCWrvtLUKaqPxSpdQhDtkzRGTXtS"
64+
},
65+
{
66+
"id": 1,
67+
"thumbnail": None,
68+
"file": None,
69+
"title": "event-featured-document-title-EHDjMGiuNukzNVtLvGGIFTKtEbxvRhALtYUSObMEqPYXLKoUdL",
70+
"description": "event-featured-document-description-EkHOUNXyjRpcKShmbCuAjASnAGXNEVUdTiHnJuQEHyulDIvIwRXURPZSqNEmprJtotXsTnSTFuEwJYUrshKRIyzwXZjscsTfwCPq"
71+
}
72+
],
73+
"links": [],
74+
"emergency_response_contact_email": None,
75+
"countries_for_preview": [],
76+
"response_activity_count": 0,
77+
"visibility": 3,
78+
"name": "event-OhbVrpoiVgRVIfLBcbfnoGMbJmTPSIAoCLrZaWZkSBvrjnWvgf",
79+
"slug": "ygwwmqzcudihyfjsonxkmtecqoxsfogyrdoxkxwnqrsrpemoki"
8880
}
8981

9082
snapshots['EventSnaphostTest::test_event_link_api 1'] = {
91-
'appeals': [
92-
],
93-
'auto_generated': False,
94-
'contacts': [
95-
],
96-
'countries': [
97-
],
98-
'countries_for_preview': [
99-
],
100-
'created_at': '2008-01-01T00:00:00.123456Z',
101-
'disaster_start_date': '2022-09-08T13:17:29.218728Z',
102-
'districts': [
103-
],
104-
'dtype': 1,
105-
'emergency_response_contact_email': None,
106-
'featured_documents': [
107-
],
108-
'field_reports': [
109-
],
110-
'glide': 'JKxDZJiNfetzTUEHAX',
111-
'hide_attached_field_reports': True,
112-
'hide_field_report_map': True,
113-
'id': 2,
114-
'ifrc_severity_level': 1,
115-
'ifrc_severity_level_display': 'Orange',
116-
'is_featured': True,
117-
'is_featured_region': True,
118-
'key_figures': [
119-
],
120-
'links': [
83+
"dtype": 1,
84+
"countries": [],
85+
"districts": [],
86+
"summary": "MGyDLJYVcCZKPmuMEGjdCgZvTfGPlcpTCCHHNkxxsyAXvRMdYOPvevgJRysqUQMjvfLQjwtPSQziMTftJyPYviQSVRHfPQBGxbxtlnvXFmoijesYgGXIVHcQvXNiMyjklSXNZkUCcAxRUpCNsWVYCoIptZYEmxRKCDXsXyGHAkmZMiqdPExJgTHhsfWkrCGjBfoCwbAdzGxpyfxobugTPvYjicsESiWTECNafbqnjJUMHBhXspthdpAOYNDehFMIbOGKpTjsBaNwpKAlQQfHxeHIGYGJbyEcOyxqVbwYewpUQOgXLVWvicwIvPlXRDSEOlZieTXDcsmcYmcutGzIEqcWPmswXdPvrhZxBzVCyvlFSFxZHrZfUBfBMlIsugfuQstCMTBkSCwCcUwNBrOYdeQOzxGZVRkbjMRYCciepXPxxyKcMjRCxxCWeKiHxzuPrphbVlFHyJhqXqTCnNsSFmhieClTCfZRuQwTeJIstkTTSOlYxGoh",
87+
"num_affected": 0,
88+
"tab_two_title": "upDhrCpjgdsyNApkuKUumWkFGDFtFbfzGDpnLwddsFMPREsIag",
89+
"tab_three_title": "BiqUxWzxczdKJmxJseyGCWJrNRNhigzxYvJxWjmMGzGccciTvZ",
90+
"disaster_start_date": "2022-09-08T13:17:29.218728Z",
91+
"created_at": "2008-01-01T00:00:00.123456Z",
92+
"auto_generated": False,
93+
"appeals": [],
94+
"contacts": [],
95+
"key_figures": [],
96+
"is_featured": True,
97+
"is_featured_region": True,
98+
"field_reports": [],
99+
"hide_attached_field_reports": True,
100+
"hide_field_report_map": True,
101+
"updated_at": "2008-01-01T00:00:00.123456Z",
102+
"id": 2,
103+
"tab_one_title": "PXKqPnXKANObFOIsPtEpZZRztDeSdkCAEDnvMjuTuUwziWxGJg",
104+
"ifrc_severity_level": 1,
105+
"ifrc_severity_level_display": "Orange",
106+
"parent_event": 1,
107+
"glide": "JKxDZJiNfetzTUEHAX",
108+
"featured_documents": [],
109+
"links": [
121110
{
122-
'description': 'event-link-description-IPdHceQdWaAiOoeTjanGDxdNOQNEQFbaIJAabHUrIsbGSRBZlggHjpmNHqwrYzfxzDKpSotRfPPWcfzyyJEdOaSkfFBPYvKgHcon',
123-
'id': 5,
124-
'title': 'event-link-title-EWunxuAcKoVjbqJLLUAsjmvoyKpFJPRvqWFUPVFDkUYwkiUIFl',
125-
'url': ''
111+
"id": 5,
112+
"url": "",
113+
"description": "event-link-description-IPdHceQdWaAiOoeTjanGDxdNOQNEQFbaIJAabHUrIsbGSRBZlggHjpmNHqwrYzfxzDKpSotRfPPWcfzyyJEdOaSkfFBPYvKgHcon",
114+
"title": "event-link-title-EWunxuAcKoVjbqJLLUAsjmvoyKpFJPRvqWFUPVFDkUYwkiUIFl"
126115
},
127116
{
128-
'description': 'event-link-description-JFdwPQyYHuSAAjtylWIEpotTjZDdJAAJHiypqnvPfCxfIUmdryRMMcemZWLUQJnEnvtanmVhVWEpSMTnzpJuXsyDIPwtqxGFDgZU',
129-
'id': 4,
130-
'title': 'event-link-title-negMcCMRTdpVczCoInWXdiGsoUKuKMXRuptjQHoAtrdJLVlORB',
131-
'url': ''
117+
"id": 4,
118+
"url": "",
119+
"description": "event-link-description-JFdwPQyYHuSAAjtylWIEpotTjZDdJAAJHiypqnvPfCxfIUmdryRMMcemZWLUQJnEnvtanmVhVWEpSMTnzpJuXsyDIPwtqxGFDgZU",
120+
"title": "event-link-title-negMcCMRTdpVczCoInWXdiGsoUKuKMXRuptjQHoAtrdJLVlORB"
132121
},
133122
{
134-
'description': 'event-link-description-RnTLFfGCZdDiGADKdJDRZtUbzqaVnLecBwSeIdeEcsAlXiXPUPAxyCyyfRQIiPwhlIzHiUoaWbtDRUIBIyopDwjrmUWhcZQANXbp',
135-
'id': 3,
136-
'title': 'event-link-title-hOsxNooiEjDVMxASJEWIZQnWpRWMYfHCHTxeKhdJGmKIjkuHCh',
137-
'url': ''
123+
"id": 3,
124+
"url": "",
125+
"description": "event-link-description-RnTLFfGCZdDiGADKdJDRZtUbzqaVnLecBwSeIdeEcsAlXiXPUPAxyCyyfRQIiPwhlIzHiUoaWbtDRUIBIyopDwjrmUWhcZQANXbp",
126+
"title": "event-link-title-hOsxNooiEjDVMxASJEWIZQnWpRWMYfHCHTxeKhdJGmKIjkuHCh"
138127
},
139128
{
140-
'description': 'event-link-description-KoIVUclAlczYFlVscatKMgvsDPIHFiGDrmZhvkUDPqTlaVvYsKRWmlNOzBGufzQgliEupaqypCWrvtLUKaqPxSpdQhDtkzRGTXtS',
141-
'id': 2,
142-
'title': 'event-link-title-VEnmIrJSrigNVLppdQHoOodgAvTEgRXiaJkAPEEPmWsusPdXfP',
143-
'url': ''
129+
"id": 2,
130+
"url": "",
131+
"description": "event-link-description-KoIVUclAlczYFlVscatKMgvsDPIHFiGDrmZhvkUDPqTlaVvYsKRWmlNOzBGufzQgliEupaqypCWrvtLUKaqPxSpdQhDtkzRGTXtS",
132+
"title": "event-link-title-VEnmIrJSrigNVLppdQHoOodgAvTEgRXiaJkAPEEPmWsusPdXfP"
144133
},
145134
{
146-
'description': 'event-link-description-EkHOUNXyjRpcKShmbCuAjASnAGXNEVUdTiHnJuQEHyulDIvIwRXURPZSqNEmprJtotXsTnSTFuEwJYUrshKRIyzwXZjscsTfwCPq',
147-
'id': 1,
148-
'title': 'event-link-title-EHDjMGiuNukzNVtLvGGIFTKtEbxvRhALtYUSObMEqPYXLKoUdL',
149-
'url': ''
135+
"id": 1,
136+
"url": "",
137+
"description": "event-link-description-EkHOUNXyjRpcKShmbCuAjASnAGXNEVUdTiHnJuQEHyulDIvIwRXURPZSqNEmprJtotXsTnSTFuEwJYUrshKRIyzwXZjscsTfwCPq",
138+
"title": "event-link-title-EHDjMGiuNukzNVtLvGGIFTKtEbxvRhALtYUSObMEqPYXLKoUdL"
150139
}
151140
],
152-
'name': 'event-OhbVrpoiVgRVIfLBcbfnoGMbJmTPSIAoCLrZaWZkSBvrjnWvgf',
153-
'num_affected': 0,
154-
'parent_event': 1,
155-
'response_activity_count': 0,
156-
'slug': 'ygwwmqzcudihyfjsonxkmtecqoxsfogyrdoxkxwnqrsrpemoki',
157-
'summary': 'MGyDLJYVcCZKPmuMEGjdCgZvTfGPlcpTCCHHNkxxsyAXvRMdYOPvevgJRysqUQMjvfLQjwtPSQziMTftJyPYviQSVRHfPQBGxbxtlnvXFmoijesYgGXIVHcQvXNiMyjklSXNZkUCcAxRUpCNsWVYCoIptZYEmxRKCDXsXyGHAkmZMiqdPExJgTHhsfWkrCGjBfoCwbAdzGxpyfxobugTPvYjicsESiWTECNafbqnjJUMHBhXspthdpAOYNDehFMIbOGKpTjsBaNwpKAlQQfHxeHIGYGJbyEcOyxqVbwYewpUQOgXLVWvicwIvPlXRDSEOlZieTXDcsmcYmcutGzIEqcWPmswXdPvrhZxBzVCyvlFSFxZHrZfUBfBMlIsugfuQstCMTBkSCwCcUwNBrOYdeQOzxGZVRkbjMRYCciepXPxxyKcMjRCxxCWeKiHxzuPrphbVlFHyJhqXqTCnNsSFmhieClTCfZRuQwTeJIstkTTSOlYxGoh',
158-
'tab_one_title': 'PXKqPnXKANObFOIsPtEpZZRztDeSdkCAEDnvMjuTuUwziWxGJg',
159-
'tab_three_title': 'BiqUxWzxczdKJmxJseyGCWJrNRNhigzxYvJxWjmMGzGccciTvZ',
160-
'tab_two_title': 'upDhrCpjgdsyNApkuKUumWkFGDFtFbfzGDpnLwddsFMPREsIag',
161-
'updated_at': '2008-01-01T00:00:00.123456Z',
162-
'visibility': 3
141+
"emergency_response_contact_email": None,
142+
"countries_for_preview": [],
143+
"response_activity_count": 0,
144+
"visibility": 3,
145+
"name": "event-OhbVrpoiVgRVIfLBcbfnoGMbJmTPSIAoCLrZaWZkSBvrjnWvgf",
146+
"slug": "ygwwmqzcudihyfjsonxkmtecqoxsfogyrdoxkxwnqrsrpemoki"
163147
}

‎api/storage.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def _open(self, name, mode='rb'):
7373
blob_name=name
7474
)
7575

76-
return ContentFile(contents)
76+
return ContentFile(contents.content)
7777

7878
def _save(self, name, content):
7979
"""

‎api/translation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class DisasterTypeTO(TranslationOptions):
6969

7070
@register(Event)
7171
class EventTO(TranslationOptions):
72-
fields = ('name', 'slug')
72+
fields = ('name', 'slug', 'summary')
7373

7474

7575
@register(ExternalPartner)

0 commit comments

Comments
 (0)