Merge develop into RC #1775
Merged
Merge develop into RC #1775
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It's not possible to create project updates to projects that aren't published. Remove the link to the update form in MyRSR's project list and only link to the form on project pages of published projects.
Add planned and actual project dates to the project status.
The PartnerType model was used to limit the types of partners that could be added by an organisation. This is now obsolete.
Simplificate the code, remove duplicate listing of partner type and fix punctuation and capitalization.
Partnership.partner_type Initial sweep of the code to move uses of partner_type to the new field iati_organisation_role. Missing is the migration to create the new field. I'm having problems that seem reated to multiple import paths.
The import of Partnership in iati/elements/participating_org.py at the module level causes a runtime error when trying to create a new migration for the Partnership model. Fix by moving the import into the function where it's used.
Also revert imports of Partnership that were changed when trying to fix the dual import problem.
Remove filtering key/value from PartnershipResource.Meta.filtering Add comment to Partnership model
A number of keywords are duplicates in fuction. This migration looks for the "old" keywords and replaces them with the "new" one.
Add some more diagnostic output Fix label characters
Keywords that aren't used in any project are deleted.
To prepare for the removal of sponsor partners, create a keyword for each organisation that is a sposor partner. The keywords are of the format <org ID>:<org name> to distinguish them from "ordinary" keywords.
[Fixes #1509] Add organisation long name to organisation page
[Fixes #1514] Project dates on project main page
Just a few indents to make it easier to follow the logic.
[Fixes #1713] Use the meta name='Description' tag
[Fixes #1740] Send mail when project is published
[Fixes #1560] Fix pagination on user management page
Enable filtering on legacy Partnership.partner_type(_2) values in the Tastypie PartnershipResource NOTE: when the Partnership.partner_type field is removed, all references to partner_type_2 should be changed to partner_type
- Renamed partner_type_2 to partner_type - Changed the backwards compatible Extending partner to 'extending', since converting this to a support partner isn't completely correct. Also, it gave issues when trying to filter on 'support' in the API, since it then only returns the partners with the accountable role and not extending. 'Extending' isn't fully backwards compatible though, because this type didn't exist before, but only new partner could have this type.
[Fixes #1659] Added IATI activity ID of budgets to finance page
[Fixes #1749] IATI check bug
[Fixes #1750] Fix project funding template
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.