| Summary: | Adding entries from data sources mixes allowed values for fields | ||
|---|---|---|---|
| Product: | [Applications] tellico | Reporter: | Robby Stephenson <robby> |
| Component: | general | Assignee: | Robby Stephenson <robby> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | ||
| Priority: | NOR | ||
| Version First Reported In: | 2.3.7 | ||
| Target Milestone: | --- | ||
| Platform: | Other | ||
| OS: | Linux | ||
| Latest Commit: | http://commits.kde.org/tellico/becfff9e6fca7862ca40e5254697867962c0368c | Version Fixed/Implemented In: | 2.3.8 |
| Sentry Crash Report: | |||
|
Description
Robby Stephenson
2013-04-05 23:59:01 UTC
Git commit becfff9e6fca7862ca40e5254697867962c0368c by Robby Stephenson. Committed on 06/04/2013 at 02:00. Pushed by rstephenson into branch '2.3'. Don't reset the list of allowed values when adding new entries Adding entries from data sources called Kernel:mergeFields() which used a QSet to merge allowed values. The result is that all the default values are always added back, and the ordering is not retained. Move Kernel::mergeFields to Document::mergeFields and retain the existing list of allowed values, appending new values _if necessary_. Add a unit test. FIXED-IN: 2.3.8 M +4 -0 ChangeLog M +1 -1 src/commands/updateentries.cpp M +43 -0 src/document.cpp M +5 -0 src/document.h M +1 -34 src/tellico_kernel.cpp M +0 -6 src/tellico_kernel.h M +33 -0 src/tests/collectiontest.cpp M +1 -0 src/tests/collectiontest.h http://commits.kde.org/tellico/becfff9e6fca7862ca40e5254697867962c0368c |