Skip to content

LIMS-1590: Dont allow name editing for lab contacts when login is set#887

Merged
ndg63276 merged 1 commit intopre-release/2025-R1.2from
improvement/LIMS-1590/make-name-uneditable-when-has-login
Jan 28, 2025
Merged

LIMS-1590: Dont allow name editing for lab contacts when login is set#887
ndg63276 merged 1 commit intopre-release/2025-R1.2from
improvement/LIMS-1590/make-name-uneditable-when-has-login

Conversation

@ndg63276
Copy link
Collaborator

@ndg63276 ndg63276 commented Jan 2, 2025

JIRA ticket: LIMS-1590

Summary:

The synchronisation scripts from UAS to ISPyB will overwrite any changes to Lab Contact names where the login or externalId fields are set, so we should disable changing them.

Changes:

  • Get and display the current value for login, or use "External" if the externalId is set.
  • Don't set the name fields to be editables if the login or externalId is not null
  • Fix some whitespace and indentation

To test:

  • Go to proposal mx23694, then go to /contacts/cid/11278, check the login is displayed, and the given name and family name fields are not editable
  • Go to /contacts/cid/5988, check the login field is blank, and the given name and family name fields are editable
  • Run this command update Person set externalId=1 where personId=267393;, then go to /contacts/cid/10731, check the login field says "External" and the name fields are not editable

@ndg63276 ndg63276 changed the base branch from master to pre-release/2025-R1.2 January 28, 2025 09:48
@ndg63276 ndg63276 merged commit 5fc0e78 into pre-release/2025-R1.2 Jan 28, 2025
2 checks passed
@ndg63276 ndg63276 deleted the improvement/LIMS-1590/make-name-uneditable-when-has-login branch January 28, 2025 11:04
ndg63276 added a commit that referenced this pull request Feb 9, 2025
* LIMS-1590: Dont allow name editing for lab contacts when login is set (#887)

* LIMS-1558: Add functionality for SMILES code for any sample (#880)

* LIMS-1490: Use callback URL for incoming dewars via shipping service (#852)

* LIMS-1570: Remove unused app file (#874)

* LIMS-1537: Add more options to reprocessing (#876)

* LIMS-1466: Disable dispatch form validation when using the shipping service (#891)
RichB-DLS pushed a commit that referenced this pull request Feb 11, 2025
* LIMS-1590: Dont allow name editing for lab contacts when login is set (#887)

* LIMS-1558: Add functionality for SMILES code for any sample (#880)

* LIMS-1490: Use callback URL for incoming dewars via shipping service (#852)

* LIMS-1570: Remove unused app file (#874)

* LIMS-1537: Add more options to reprocessing (#876)

* LIMS-1466: Disable dispatch form validation when using the shipping service (#891)
ndg63276 added a commit that referenced this pull request Apr 22, 2025
* LIMS-1612 - add util fn for generating md5.

* test/LIMS-1612 - Setup Basic param tests.

* feat/LIMS-1612 - implement the new md5 util across all uses of uniqId

* fix/LIMS-1612 -  Fix PSALM faiure

* Merge pre-release/2025-R1.2 into master (#904)

* LIMS-1590: Dont allow name editing for lab contacts when login is set (#887)

* LIMS-1558: Add functionality for SMILES code for any sample (#880)

* LIMS-1490: Use callback URL for incoming dewars via shipping service (#852)

* LIMS-1570: Remove unused app file (#874)

* LIMS-1537: Add more options to reprocessing (#876)

* LIMS-1466: Disable dispatch form validation when using the shipping service (#891)

* fix/LIMS-1612  compatibility with LIMS-1490

---------

Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants