diff options
| author |  Joakim Bygdell <j.bygdell@gmail.com> | 2017-12-06 18:54:46 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-12-07 21:43:17 -0600 |
| commit | e9bcca910375f35c63afe8edb4ed0494fe4a4609 (patch) | |
| tree | 829b51f81301720b228a06f28893919a06827a49 | |
| parent | a2a2aec9f0b6df90ada22ae088deb7552cfb1f92 (diff) | |
| download | subsurface-e9bcca910375f35c63afe8edb4ed0494fe4a4609.tar.gz | |
Mobile: Enable editing multiple buddies
While the autocomplete function only works for the first entry
adding multiple comma separated buddies can still be done.
Fixes #608
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
| -rw-r--r-- | mobile-widgets/qml/DiveDetails.qml | 2 | ||||
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index dc0af53b6..41e7f50be 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -229,7 +229,7 @@ Kirigami.Page { watertemp = currentItem.modelData.dive.waterTemp suitIndex = currentItem.modelData.dive.suitList.indexOf(currentItem.modelData.dive.suit) if (currentItem.modelData.dive.buddy.indexOf(",") > 0) { - buddyIndex = currentItem.modelData.dive.buddyList.indexOf(qsTr("Multiple Buddies")); + buddyText = currentItem.modelData.dive.buddy; } else { buddyIndex = currentItem.modelData.dive.buddyList.indexOf(currentItem.modelData.dive.buddy) } diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 413364a65..21ce76735 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -1008,11 +1008,9 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q if (buddy.contains(",")){ buddy = buddy.replace(QRegExp("\\s*,\\s*"), ", "); } - if (!buddy.contains("Multiple Buddies")) { - diveChanged = true; - free(d->buddy); - d->buddy = strdup(qPrintable(buddy)); - } + diveChanged = true; + free(d->buddy); + d->buddy = strdup(qPrintable(buddy)); } if (myDive->divemaster() != diveMaster) { diveChanged = true; |