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.

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

Re-add permissions changes for files on withdrawn registrations #10671

Merged

Conversation

jwalz
Copy link
Contributor

@jwalz jwalz commented Jul 17, 2024

This reverts commit 34d5641.

Purpose

Changes for ENG-3685 were reverted to avoid any complications with the Python Upgrade release. Re-add those changes to the b&i feature branch.

Changes

See #10650

QA Notes

Please make verification statements inspired by your code and what your code touches.

  • Verify
  • Verify

What are the areas of risk?

Any concerns/considerations/questions that development raised?

Documentation

Side Effects

Ticket

@jwalz jwalz merged commit 55aa055 into CenterForOpenScience:feature/b-and-i-24-14 Jul 17, 2024
6 checks passed
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Aug 13, 2024
…penScience/osf.io into fix-source-tags

* 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io:
  refactor handle_duplicate_notifications and add tests
  Shorten lines; rename script for test clarity
  fix flake8 errors
  add admin screen to manage duplicate notifications
  [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660)
  [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691)
  add exception handling in case state doesn't change
  [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678)
  restrict state changes more and allow no-ops
  split apart change provider views from general preprint view and machine_state change viewa
  Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671)
  [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662)

# Conflicts:
#	addons/boa/requirements.txt
#	addons/box/requirements.txt
#	addons/dataverse/requirements.txt
#	addons/dropbox/requirements.txt
#	addons/github/requirements.txt
#	addons/gitlab/requirements.txt
#	addons/mendeley/requirements.txt
#	addons/owncloud/requirements.txt
#	addons/s3/requirements.txt
#	addons/twofactor/requirements.txt
#	addons/wiki/requirements.txt
#	addons/zotero/requirements.txt
#	api/base/utils.py
#	api/users/serializers.py
#	api_tests/draft_registrations/views/test_draft_registration_list.py
#	api_tests/nodes/views/test_node_draft_registration_list.py
#	api_tests/users/views/test_user_draft_registration_list.py
#	api_tests/users/views/test_user_settings.py
#	docker-compose.yml
#	poetry.lock
#	pyproject.toml
#	requirements.txt
#	requirements/dev.txt
#	requirements/release.txt
#	tests/test_views.py
#	website/util/metrics.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Aug 13, 2024
…penScience/osf.io into fix-source-tags

* 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io:
  refactor handle_duplicate_notifications and add tests
  Shorten lines; rename script for test clarity
  fix flake8 errors
  add admin screen to manage duplicate notifications
  [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660)
  [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691)
  add exception handling in case state doesn't change
  [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678)
  restrict state changes more and allow no-ops
  split apart change provider views from general preprint view and machine_state change viewa
  Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671)
  [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662)

# Conflicts:
#	addons/boa/requirements.txt
#	addons/box/requirements.txt
#	addons/dataverse/requirements.txt
#	addons/dropbox/requirements.txt
#	addons/github/requirements.txt
#	addons/gitlab/requirements.txt
#	addons/mendeley/requirements.txt
#	addons/owncloud/requirements.txt
#	addons/s3/requirements.txt
#	addons/twofactor/requirements.txt
#	addons/wiki/requirements.txt
#	addons/zotero/requirements.txt
#	api/base/utils.py
#	api/users/serializers.py
#	api_tests/draft_registrations/views/test_draft_registration_list.py
#	api_tests/nodes/views/test_node_draft_registration_list.py
#	api_tests/users/views/test_user_draft_registration_list.py
#	api_tests/users/views/test_user_settings.py
#	docker-compose.yml
#	poetry.lock
#	pyproject.toml
#	requirements.txt
#	requirements/dev.txt
#	requirements/release.txt
#	tests/test_views.py
#	website/util/metrics.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Aug 13, 2024
…penScience/osf.io into fix-source-tags

* 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io:
  refactor handle_duplicate_notifications and add tests
  Shorten lines; rename script for test clarity
  fix flake8 errors
  add admin screen to manage duplicate notifications
  [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660)
  [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691)
  add exception handling in case state doesn't change
  [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678)
  restrict state changes more and allow no-ops
  split apart change provider views from general preprint view and machine_state change viewa
  Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671)
  [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662)

# Conflicts:
#	addons/boa/requirements.txt
#	addons/box/requirements.txt
#	addons/dataverse/requirements.txt
#	addons/dropbox/requirements.txt
#	addons/github/requirements.txt
#	addons/gitlab/requirements.txt
#	addons/mendeley/requirements.txt
#	addons/owncloud/requirements.txt
#	addons/s3/requirements.txt
#	addons/twofactor/requirements.txt
#	addons/wiki/requirements.txt
#	addons/zotero/requirements.txt
#	api/base/utils.py
#	api/users/serializers.py
#	api_tests/draft_registrations/views/test_draft_registration_list.py
#	api_tests/nodes/views/test_node_draft_registration_list.py
#	api_tests/users/views/test_user_draft_registration_list.py
#	api_tests/users/views/test_user_settings.py
#	docker-compose.yml
#	poetry.lock
#	pyproject.toml
#	requirements.txt
#	requirements/dev.txt
#	requirements/release.txt
#	tests/test_views.py
#	website/util/metrics.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Aug 21, 2024
…penScience/osf.io into fix-preprint-emails

* 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io:
  Make resubmissions more like submissions (CenterForOpenScience#10709)
  renamed files with travis in their names
  fixed case where it was more appropriate
  removed all travis mentions and replaced them with CI
  [ENG-2562] add system tags to users created via institutional sign up system (CenterForOpenScience#10696)
  refactor handle_duplicate_notifications and add tests
  Shorten lines; rename script for test clarity
  fix flake8 errors
  add admin screen to manage duplicate notifications
  [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660)
  [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691)
  add exception handling in case state doesn't change
  [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678)
  restrict state changes more and allow no-ops
  split apart change provider views from general preprint view and machine_state change viewa
  Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671)
  [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662)

# Conflicts:
#	osf/utils/notifications.py
#	website/templates/emails/reviews_resubmission_confirmation.html.mako
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Aug 21, 2024
…penScience/osf.io into fix-preprint-emails

* 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io:
  Make resubmissions more like submissions (CenterForOpenScience#10709)
  renamed files with travis in their names
  fixed case where it was more appropriate
  removed all travis mentions and replaced them with CI
  [ENG-2562] add system tags to users created via institutional sign up system (CenterForOpenScience#10696)
  refactor handle_duplicate_notifications and add tests
  Shorten lines; rename script for test clarity
  fix flake8 errors
  add admin screen to manage duplicate notifications
  [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660)
  [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691)
  add exception handling in case state doesn't change
  [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678)
  restrict state changes more and allow no-ops
  split apart change provider views from general preprint view and machine_state change viewa
  Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671)
  [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662)

# Conflicts:
#	osf/utils/notifications.py
#	website/templates/emails/reviews_resubmission_confirmation.html.mako
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant