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

Fix for m2 #192

Closed
wants to merge 10,000 commits into from
Closed

Fix for m2 #192

wants to merge 10,000 commits into from

Conversation

Johnetordoff
Copy link
Owner

Purpose

Changes

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

Johnetordoff and others added 30 commits December 19, 2022 16:24
* Allow moderation of submissions to collections

Co-authored-by: John Tordoff <>
in some cases, `api.base.serializers.RelationshipField` requires that
the serializer field have the same name as the corresponding model
field, which is a problematic entanglement of the api and data layers.

digging to fix this bug led to a broader cleanup:
- since `RelationshipField` overrides all meaningful logic in
  `HyperlinkedIdentityField` (with some extra logic to counteract it),
  change to simply extend `Field`.
- extending `Field` removes an implicit `source='*'`, which is good
  because RelationshipField subclasses with `to_internal_value` don't
  always have to know the name they're bound to on the serializer.
- update `FilterMixin` to:
  - remove unnecessary `parse_sparse_fields` call, which allows us to
  - use bound serializer fields (which have `source` correctly set).
  - prefer `filter_key`, when it exists.
- remove unused sparse-fieldset logic and tidy the rest a bit.
- consolidate some redundant utils (`api.base.utils.decompose_field`,
  `JSONAPISerializer.get_unwrapped_field').
…rForOpenScience#10118)

* Optimize filtering nonnull parents

* Switch OKState SSO from CAS to SAML

* Fix ES contributor serialization

* updated project_header.mako with Metadata tab.

* removing merged files from commit.

* resolving merge conflicts.

* resolving merge conflicts.

* resolving merge conflicts.

* resolving merge conflicts.

* resolving merge conflicts.

* resolving merge conflicts.

* resolving merge conflicts.

* resolving merge conflicts.

* resolving merge conflicts.

* resolving merge conflicts.

* resolving merge conflicts.

* resolving merge conflicts.

* resolving merge conflicts.

* resolving merge conflicts.

* resolving merge conflicts.

* Corrected placement of Metadata tab for project header file.

Co-authored-by: Matt Frazier <[email protected]>
Co-authored-by: Longze Chen <[email protected]>
Co-authored-by: Ashley <[email protected]>
add GuidMetadataRecord model, expose it in the api in only a limited way
…penScience#10254)

- [Institution Rework] [ENG-4229] Add unit tests to cover reworked SSO flow with identity and affiliation (CenterForOpenScience#10313)
- [Institution Rework] [ENG-4202] Another follow-up: Fix/Improve email templates (CenterForOpenScience#10311)
- [Institution Rework] [ENG-4202] Follow-up: Add email templates (CenterForOpenScience#10308)
- [Institution Rework] [ENG-4204] Part 2: Minor tweak SSO exceptions for CAS (CenterForOpenScience#10299)
- [Institution Rework] [ENG-4198] Fix/Improve Migration Command (CenterForOpenScience#10293)
- [Institution Rework] [Bug Fix] Remove user from institution metrics admin when affiliation is removed (CenterForOpenScience#10290)
- [Institution Rework] [Bug Fix] Exclude banner_name and logo_name from form fields (CenterForOpenScience#10289)
- [Institution Rework] [Bug Fix] Fix admin asset and institution filter (CenterForOpenScience#10283)
- [Institution Rework] [Bug Fix] Return placeholder images as fallback (CenterForOpenScience#10282)
- [Institution Rework] [ENG-4202] [ENG-4204] Rework Institution SSO flow with identity and affiliation - API Part (CenterForOpenScience#10260)
- [Institution Rework] [ENG-4216] [ENG-4217] Change asset references (CenterForOpenScience#10247)
- [Institution Rework] [ENG-4206] [ENG-4207] Institution assets rework (CenterForOpenScience#10240)
- [Institution Rework] [ENG-4199] [ENG-4200] Update user-institution affiliation references (CenterForOpenScience#10236)
- [Institution Rework] [ENG-4197] [ENG-4198] Add a new model for user-institution affiliation (CenterForOpenScience#10227)
aaxelb and others added 23 commits August 24, 2023 11:02
if a custom subject has the exact name of its bepress synonym, do not
bother including both in metadata records (they result in wrong-looking
duplicates in the search interface and add no value to the metadata)
- handle FileVersion with null creator
- do not index osfstorage file without versions
* Allow PreprintProviders to specify preferred citation styles and restore ability to opt out of Sloan assertions
…orOpenScience#10395)

* update transactions to totally rollback on failure, instead of partial state change (and log to Sentry)

Co-authored-by: John Tordoff <>
@Johnetordoff Johnetordoff force-pushed the fix-for-m2 branch 3 times, most recently from 48e3a53 to 89f3a6c Compare September 25, 2023 17:12
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.