Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#2189] Move to IATI statuses #2207

Merged
merged 35 commits into from
Jun 1, 2016
Merged

[#2189] Move to IATI statuses #2207

merged 35 commits into from
Jun 1, 2016

Conversation

damienallen
Copy link
Contributor

Fixes #2189

damienallen and others added 28 commits May 25, 2016 10:20
@damienallen
[Fixes #2189] Migrations for new 'iati_status' field with converted s…
a965f03 
…tatuses
@damienallen
[Fixes #2189] Update legacy 'status' field on save
22d0a67
@damienallen
[Fixes #2189] Updates to project editor
dbd53ac
@KasperBrandt
[#1804] Remove country field from editor and convert countries
dbb284b
@KasperBrandt
[#1804] Remove country as publishing requirement and report page
87c20e0
@damienallen
[Fixes #2189] Updates to widgets
46b797f
@damienallen
[Fixes #2189] Widget CSS fixes for new status text
6c23c33
@KasperBrandt
[#1804] Update project header
132ad4a
@KasperBrandt
[#1804] Fix bug in migration
4e61d52
@KasperBrandt
[#1804] Update donate page
e881954
@KasperBrandt
[#1804] Update mention of country per project in project list
8e9df95
@damienallen
[Fixes #2189] Updates to 'My Projects'
dc629c2
@damienallen
[Fixes #2189] Updated project editing permissions
a8a5cff
@KasperBrandt
[#1804] Remove conversion of location.country to recipient-country in…
bfd8300 
… IATI import
@KasperBrandt
[#1804] Update location filter of project list
2b4cfc6
@damienallen
[Fixes #2189] Updated references to project status
9491040
@KasperBrandt
[#1804] Remove project update location countries
e720c13
@KasperBrandt
[#1804] Convert organisation location countries to IATI codelist
f126396
@KasperBrandt
[#1804] Update location filter on organisations list
d5686ac
@damienallen
[Fixes #2189] Updates to organisation page & added filter to projects…
7819445 
… list page
@KasperBrandt
[#1804] Update organisations list
8483d0f
@damienallen
[Fixes #2189] Further updating of project status references
45ea23d
@KasperBrandt
[#1804] Some smaller changes in templates
81e73eb
@KasperBrandt
[#1804] Convert the employment countries to IATI countries
3f982f7
@KasperBrandt
[#1804] Update 'Request to join an organisation' module
52da7a2
@KasperBrandt
[#1804] Make data migrations reversable
0abe652
@damienallen
[Fixes #2189] Updates to project editor and added 'none' status
9521304
@damienallen
[Fixes #2189] Updates to IATI import/export
191d4c8
@akvobot
Copy link

akvobot commented May 26, 2016 •
edited by KasperBrandt
Loading

Checklist

  • Test plan
  • Copyright header
  • Code formatting
  • Documentation

KasperBrandt
KasperBrandt reviewed May 26, 2016
View reviewed changes
akvo/iati/imports/mappers/defaults.py
self.add_log('activity-status@code', 'status', 'invalid status code')
status = Project.STATUS_NONE
status = 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably be a string instead of integer, right?

@KasperBrandt
Copy link
Contributor

Also change the field in the 'old' project admin to use iati_status instead of status.

@damienallen
Copy link
Contributor Author

Only merge after #2206 has been merged

@damienallen damienallen changed the title #2189 Transition to IATI statuses (w/legacy support) [#2189] Transition to IATI statuses May 27, 2016
@damienallen damienallen changed the title [#2189] Transition to IATI statuses [#2189] Move to IATI statuses May 31, 2016
@KasperBrandt KasperBrandt merged commit 49bcf93 into develop Jun 1, 2016
@KasperBrandt KasperBrandt deleted the #2189-iati-status-field branch June 1, 2016 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@KasperBrandt KasperBrandt

Labels
None yet
Projects
RSR
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@damienallen @akvobot @KasperBrandt