From 03143f1ef1a3b290c7e721ee5109e0ef275f6cec Mon Sep 17 00:00:00 2001 From: Jocke Date: Tue, 13 Nov 2018 21:28:18 +0100 Subject: Mobile: Allow multiple divemasters While not something that many will use, editing a dive on Subsurface-mobile should not result in data loss. This makes the divemaster field behave in the same way as the buddy field with regards to multiple entries. Fixes #1853 Signed-off-by: Joakim Bygdell Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/DiveDetails.qml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mobile-widgets/qml') diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index fbffa5303..3b2fd2c1c 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -258,7 +258,12 @@ Kirigami.Page { buddyIndex = manager.buddyList.indexOf(currentItem.modelData.dive.buddy) } buddyText = currentItem.modelData.dive.buddy; - divemasterIndex = manager.divemasterList.indexOf(currentItem.modelData.dive.divemaster) + if (currentItem.modelData.dive.divemaster.indexOf(",") > 0) { + divemasterIndex = manager.divemasterList.indexOf(currentItem.modelData.dive.divemaster.split(",", 1).toString()) + } else { + divemasterIndex = manager.divemasterList.indexOf(currentItem.modelData.dive.divemaster) + } + divemasterText = currentItem.modelData.dive.divemaster notes = currentItem.modelData.dive.notes if (currentItem.modelData.dive.singleWeight) { // we have only one weight, go ahead, have fun and edit it -- cgit v1.2.3-70-g09d2