Skip to content

Added old logic to handle displayed foreign key and update the UI and…#4428

Merged
Withalion merged 6 commits intomasterfrom
fix-foreign-key-regression
Mar 30, 2026
Merged

Added old logic to handle displayed foreign key and update the UI and…#4428
Withalion merged 6 commits intomasterfrom
fix-foreign-key-regression

Conversation

@gabriel-bolbotina
Copy link
Copy Markdown
Contributor

@gabriel-bolbotina gabriel-bolbotina commented Mar 27, 2026

Fixed the issue by using the setFormValue (which updates the UI and uses setAttribute) if the foreign key field is displayed in the child's form, and if not present, adding the value via setAttribute.
Added unit test to check that the rawValue is updated when adding a new child feature

… rawValue

Kept the new logic is the field is not displayed
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Mar 27, 2026

Pull Request Test Coverage Report for Build 23744866307

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 183 unchanged lines in 3 files lost coverage.
  • Overall coverage decreased (-0.1%) to 59.768%

Files with Coverage Reduction New Missed Lines %
mm/core/merginuserauth.cpp 9 68.24%
mm/core/merginapi.cpp 13 75.07%
mm/app/attributes/attributecontroller.cpp 161 76.32%
Totals Coverage Status
Change from base Build 23592458465: -0.1%
Covered Lines: 8777
Relevant Lines: 14685

💛 - Coveralls

@github-actions
Copy link
Copy Markdown

📦 Build Artifacts Ready

OS Status Build Info Workflow run
macOS Build 📬 Mergin Maps 65831 dmg Expires: 25/06/2026 #6583
linux Build 📬 Mergin Maps 65941 x86_64 Expires: 25/06/2026 #6594
win64 Build 📬 Mergin Maps 57781 win64 Expires: 25/06/2026 #5778
Android Build 📬 Mergin Maps 789511 APK [armeabi-v7a] Expires: 25/06/2026 #7895
📬 Mergin Maps 789511 APK [armeabi-v7a] Google Play Store #7895
Android Build 📬 Mergin Maps 789551 APK [arm64-v8a] Expires: 25/06/2026 #7895
📬 Mergin Maps 789551 APK [arm64-v8a] Google Play Store #7895
iOS Build 📬 Build number: 26.03.883411 #8834

@gabriel-bolbotina gabriel-bolbotina marked this pull request as ready for review March 30, 2026 10:16
@github-actions
Copy link
Copy Markdown

📦 Build Artifacts Ready

OS Status Build Info Workflow run
macOS Build 📬 Mergin Maps 65921 dmg Expires: 28/06/2026 #6592
linux Build 📬 Mergin Maps 66031 x86_64 Expires: 28/06/2026 #6603
win64 Build 📬 Mergin Maps 57871 win64 Expires: 28/06/2026 #5787
Android Build 📬 Mergin Maps 790451 APK [arm64-v8a] Expires: 28/06/2026 #7904
📬 Mergin Maps 790451 APK [arm64-v8a] Google Play Store #7904
Android Build 📬 Mergin Maps 790411 APK [armeabi-v7a] Expires: 28/06/2026 #7904
📬 Mergin Maps 790411 APK [armeabi-v7a] Google Play Store #7904
iOS Build 📬 Build number: 26.03.884311 #8843

Comment thread app/attributes/attributecontroller.cpp
Copy link
Copy Markdown
Contributor

@Withalion Withalion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job!

You can spring some more QStringLiterals over it, but it looks good.

Comment thread app/test/testattributecontroller.cpp Outdated
@github-actions
Copy link
Copy Markdown

📦 Build Artifacts Ready

OS Status Build Info Workflow run
macOS Build 📬 Mergin Maps 65931 dmg Expires: 28/06/2026 #6593
linux Build 📬 Mergin Maps 66041 x86_64 Expires: 28/06/2026 #6604
win64 Build 📬 Mergin Maps 57881 win64 Expires: 28/06/2026 #5788
Android Build 📬 Mergin Maps 790511 APK [armeabi-v7a] Expires: 28/06/2026 #7905
📬 Mergin Maps 790511 APK [armeabi-v7a] Google Play Store #7905
Android Build 📬 Mergin Maps 790551 APK [arm64-v8a] Expires: 28/06/2026 #7905
📬 Mergin Maps 790551 APK [arm64-v8a] Google Play Store #7905
iOS Build 📬 Build number: 26.03.884411 #8844

@github-actions
Copy link
Copy Markdown

📦 Build Artifacts Ready

OS Status Build Info Workflow run
macOS Build 📬 Mergin Maps 65951 dmg Expires: 28/06/2026 #6595
linux Build 📬 Mergin Maps 66061 x86_64 Expires: 28/06/2026 #6606
win64 Build 📬 Mergin Maps 57901 win64 Expires: 28/06/2026 #5790
Android Build 📬 Mergin Maps 790751 APK [arm64-v8a] Expires: 28/06/2026 #7907
📬 Mergin Maps 790751 APK [arm64-v8a] Google Play Store #7907
Android Build 📬 Mergin Maps 790711 APK [armeabi-v7a] Expires: 28/06/2026 #7907
📬 Mergin Maps 790711 APK [armeabi-v7a] Google Play Store #7907
iOS Build 📬 Build number: 26.03.884611 #8846

@Withalion Withalion changed the base branch from master to hotfix/2026_1_3-foreign-key March 30, 2026 14:13
@Withalion Withalion changed the base branch from hotfix/2026_1_3-foreign-key to master March 30, 2026 14:14
@Withalion Withalion merged commit abc39e1 into master Mar 30, 2026
9 checks passed
@Withalion Withalion deleted the fix-foreign-key-regression branch March 30, 2026 14:15
@Withalion Withalion added this to the 2026.1.3 milestone Mar 30, 2026
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.

3 participants