-
Notifications
You must be signed in to change notification settings - Fork 9
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.
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
Give external users an institution #79
Open
markgdawson
wants to merge
544
commits into
issa16:master
Choose a base branch
from
markgdawson:give-external-users-an-institution
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Give external users an institution #79
markgdawson
wants to merge
544
commits into
issa16:master
from
markgdawson:give-external-users-an-institution
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
Finalised version of Ben's code
removed atomic=False from migrations
tidy up definition of owner in funding
…ons with funding workflow currently owning institution project reference is used to refer to the finance code of a grant associated with the project, and not much else. with the attribution workflow providing a dedicated place for finance codes, this field is now redundant so should not be shown for institutions opted in to teh new workflow.
this should be OK for all institutions since it's an optional field, and it will stop the tests breaking for institutions opted into the priority workflow.
Some business logic must be understood. The website behaves strangely now.
use a manual filter rather than relying on the Model in AttributionListView
Remove institutional reference from project form for attribution workflow users
This reverts commit 30d63e8.
This reverts commit 30d63e8.
…ls in fixtures for aberystwyth
update details of repositories for Aberystwyth (fix edbennett#67)
Issues in templates/project/application_details.html. Non existing data members do not cause visible errors in templates. (CustomUser.institution does not exist, it's CustomUser.profile.institution that exists instead) Also indentation and unterminated <small> tag in template.
This avoids key constraints on existing data, but there might be better ways of doing this.
add legacy_funding_body to Project model
refactor Project.AP() and add unit tests for it
This reverts commit e5ad609. I had made this change to test/check accidentally pushed change to master. Reverting doesn't work, and should be left as it is
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.
I'm creating a pull request to track work on this branch. It still has several tests failing, but is a (small) start toward this. I wanted to see mostly how much work it would be - and the answer seems to be "not too much".
The issue is that currently behavior is determined from the institution, which is determined by the tech_lead institution. If the tech_lead is an external user, then it is unclear what behavior should be adopted and cogs will occasionally break.
There are a few possibilities. One would be always check that user is not an external user (which is possible). Maybe a better option would be to assign each external users an institution (and therefore a behavior).