From a3456d388d4b52b2107c3ec55e0be9fdd6d80b1e Mon Sep 17 00:00:00 2001 From: MEHMETKECECI Date: Sat, 14 Feb 2026 14:56:06 +0300 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ui/src/stores/UserDetailStore.js | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/ui/src/stores/UserDetailStore.js b/ui/src/stores/UserDetailStore.js index 6d1dd0a..e2e760c 100644 --- a/ui/src/stores/UserDetailStore.js +++ b/ui/src/stores/UserDetailStore.js @@ -23,9 +23,9 @@ export const useUserDetailStore = defineStore('userDetail', { is_active: true, address: '', roles: [], - departments: [], + departments: null, piyasalar: [], - nebim_users: [] + nebim_users: null }, /* ================= LOOKUPS ================= */ @@ -49,9 +49,9 @@ export const useUserDetailStore = defineStore('userDetail', { is_active: true, address: '', roles: [], - departments: [], + departments: null, piyasalar: [], - nebim_users: [] + nebim_users: null } this.error = null this.hasPassword = false @@ -91,6 +91,14 @@ export const useUserDetailStore = defineStore('userDetail', { 📦 PAYLOAD BUILDER (BACKEND SÖZLEŞMESİYLE UYUMLU) ===================================================== */ buildPayload () { + const departmentCodes = Array.isArray(this.form.departments) + ? this.form.departments + : (this.form.departments ? [this.form.departments] : []) + + const nebimUsernames = Array.isArray(this.form.nebim_users) + ? this.form.nebim_users + : (this.form.nebim_users ? [this.form.nebim_users] : []) + return { code: this.form.code, full_name: this.form.full_name, @@ -101,14 +109,11 @@ export const useUserDetailStore = defineStore('userDetail', { roles: this.form.roles, - // ✅ TEK DEPARTMAN (string → backend array) - departments: this.form.departments - ? [{ code: this.form.departments }] - : [], + departments: departmentCodes.map(code => ({ code })), piyasalar: (this.form.piyasalar || []).map(code => ({ code })), - nebim_users: (this.form.nebim_users || []).map(username => { + nebim_users: nebimUsernames.map(username => { const opt = (this.nebimUserOptions || []).find(x => x.value === username) return { username, @@ -137,9 +142,9 @@ export const useUserDetailStore = defineStore('userDetail', { this.form.address = data.address || '' this.form.roles = data.roles || [] - this.form.departments = (data.departments || []).map(x => x.code) + this.form.departments = (data.departments || []).map(x => x.code)[0] || null this.form.piyasalar = (data.piyasalar || []).map(x => x.code) - this.form.nebim_users = (data.nebim_users || []).map(x => x.username) + this.form.nebim_users = (data.nebim_users || []).map(x => x.username)[0] || null this.hasPassword = !!data.has_password } catch (e) {