Skip to content

Fix proposal type assignment#975

Merged
gfrn merged 1 commit intopre-release/2025-R3.5.2from
fix/proposal-type-null
Aug 12, 2025
Merged

Fix proposal type assignment#975
gfrn merged 1 commit intopre-release/2025-R3.5.2from
fix/proposal-type-null

Conversation

@gfrn
Copy link
Collaborator

@gfrn gfrn commented Aug 12, 2025

Summary:

Sometimes, the proposal type is set to "null" during the process in which we determine the proposal type, and therefore, defaults to "gen". This checks that the determined proposal type is not null before assigning it to the final proposal object.

Changes:

  • Fix proposal type assignment

To test:

  • Go to any older proposal that may get a null proposal type from _get_type_from_beamline (such as sw30864)
  • Check that the menu displays all MX options, instead of the generic, shortened menu
  • Go to any "recent" proposal such as cm40607, check that MX options are displayed
  • Go to any recent VMXi proposal, such as cm40605, check that VMXi options are displayed
  • Repeat for other experiment types if so desired

@gfrn gfrn requested a review from ndg63276 August 12, 2025 09:05
@gfrn gfrn self-assigned this Aug 12, 2025
@gfrn gfrn added the bug label Aug 12, 2025
@gfrn gfrn changed the base branch from master to pre-release/2025-R3.5.1 August 12, 2025 09:05
@gfrn gfrn changed the base branch from pre-release/2025-R3.5.1 to pre-release/2025-R3.5.2 August 12, 2025 09:26
@gfrn gfrn merged commit 0fd3de8 into pre-release/2025-R3.5.2 Aug 12, 2025
2 checks passed
@gfrn gfrn deleted the fix/proposal-type-null branch August 12, 2025 09:26
ndg63276 added a commit that referenced this pull request Aug 26, 2025
* LIMS-742: Remove redundant 'pid' check (#961)

* LIMS-1780 / LIMS-1787: Show strategies on characterizations, auto processing on grid scans (#956)

* LIMS-1792: Allow container types from multiple villages (#960)

* LIMS-1796: Display filepath for attachments (#959)

* LIMS-1798: Only show the latest dispensing position (#952)

* LIMS-1550: Add 'Mark Dispensing' button to plate well view (#869)

* LIMS-167: Dont default to mx type for calendar/logistics views (#942)

* LIMS-1716: Multicrystal processing only shows one DC per group (#938)

* LIMS-1718: Display cluster info on multiplex jobs (#937)

* LIMS-1752: Create view for Ligand Fit pipeline (#943)

* LIMS-1833: Fix XPDF DC view (#963)

* LIMS-1845: Fix broken VMXi attachment names (#968)

* LIMS-1848: Fix bug where no container types are available (#971)

* Check type before assigning to proposal object (#975)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants