v63, fix club addition from search

multistore
Razmig Sarkissian 1 year ago
parent 0daf983da6
commit 0435956124
  1. 4
      PadelClub.xcodeproj/project.pbxproj
  2. 1
      PadelClub/Views/Club/ClubDetailView.swift
  3. 14
      PadelClub/Views/Club/ClubSearchView.swift

@ -1908,7 +1908,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 62; CURRENT_PROJECT_VERSION = 63;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
@ -1949,7 +1949,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 62; CURRENT_PROJECT_VERSION = 63;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
DEVELOPMENT_TEAM = BQ3Y44M3Q6; DEVELOPMENT_TEAM = BQ3Y44M3Q6;

@ -43,6 +43,7 @@ struct ClubDetailView: View {
dataStore.user.clubs.append(club.id) dataStore.user.clubs.append(club.id)
} }
self.dataStore.saveUser() self.dataStore.saveUser()
dismiss()
} }
} footer: { } footer: {
if displayContext == .lockedForEditing { if displayContext == .lockedForEditing {

@ -303,7 +303,7 @@ struct ClubSearchView: View {
} }
private func _importClub(clubToEdit: Club, clubMarker: ClubMarker) { private func _importClub(clubToEdit: Club, clubMarker: ClubMarker) {
if clubToEdit.creator == dataStore.user.id { if clubToEdit.hasBeenCreated(by: Store.main.userId) {
if clubToEdit.name.isEmpty { if clubToEdit.name.isEmpty {
clubToEdit.name = clubMarker.nom.capitalized clubToEdit.name = clubMarker.nom.capitalized
clubToEdit.acronym = clubToEdit.automaticShortName().capitalized clubToEdit.acronym = clubToEdit.automaticShortName().capitalized
@ -314,17 +314,19 @@ struct ClubSearchView: View {
clubToEdit.city = clubMarker.ville clubToEdit.city = clubMarker.ville
} }
if displayContext == .addition { if displayContext == .addition && clubToEdit.hasBeenCreated(by: Store.main.userId) {
do { do {
try dataStore.clubs.addOrUpdate(instance: clubToEdit) try dataStore.clubs.addOrUpdate(instance: clubToEdit)
if dataStore.user.clubs.contains(where: { $0 == clubToEdit.id }) == false {
dataStore.user.clubs.append(clubToEdit.id)
self.dataStore.saveUser()
}
} catch { } catch {
Logger.error(error) Logger.error(error)
} }
} }
if dataStore.user.clubs.contains(where: { $0 == clubToEdit.id }) == false {
dataStore.user.clubs.append(clubToEdit.id)
self.dataStore.saveUser()
}
dismiss() dismiss()
selection?(clubToEdit) selection?(clubToEdit)
} }

Loading…
Cancel
Save