From 3568b12cd4093b482424bb0d32c288f3429922ca Mon Sep 17 00:00:00 2001 From: tsygankoviva Date: Fri, 7 Aug 2026 09:09:35 +0300 Subject: [PATCH] =?UTF-8?q?fix-editable-columns:=20=D0=BF=D0=BE=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D1=81=D0=B8=D0=BB=20=D0=B2=D0=BE=D0=B7=D0=B2=D1=80?= =?UTF-8?q?=D0=B0=D1=89=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B5=D0=B4=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=B8=D1=80=D1=83=D0=B5=D0=BC=D1=8B=D1=85=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D0=BD=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/alembic/versions/sql/0015_aggregates_fix.sql | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/api/alembic/versions/sql/0015_aggregates_fix.sql b/api/alembic/versions/sql/0015_aggregates_fix.sql index 51b20cf..6f3382c 100644 --- a/api/alembic/versions/sql/0015_aggregates_fix.sql +++ b/api/alembic/versions/sql/0015_aggregates_fix.sql @@ -1383,6 +1383,7 @@ $function$ ; + CREATE OR REPLACE FUNCTION v3.v_form_view(p_form_id integer, p_sheet character varying, p_sections text[] DEFAULT NULL::text[], p_direction character varying DEFAULT NULL::character varying, p_user_id integer DEFAULT NULL::integer) RETURNS TABLE(row_type character varying, depth integer, sort_order bigint, data jsonb) LANGUAGE plpgsql @@ -1404,8 +1405,8 @@ BEGIN END IF; v_user_id := p_user_id; - IF p_user_id IS NOT NULL THEN - v_user_id := v3.current_user_id; + IF p_user_id IS NULL THEN + v_user_id := v3.current_user_id(); END IF; RETURN QUERY SELECT @@ -1413,15 +1414,15 @@ BEGIN -1, 0::BIGINT, jsonb_build_object( - 'user_id', p_user_id, - 'role', v3.user_role_code(p_user_id), + 'user_id', v_user_id, + 'role', v3.user_role_code(v_user_id), 'sheet', p_sheet, 'editable', COALESCE( (SELECT jsonb_agg( jsonb_build_object('column', ec.column_key, 'closes_at', ec.closes_at) ORDER BY ec.column_key) - FROM v3.editable_columns_for(p_form_id, p_user_id, p_sheet, p_direction) ec), + FROM v3.editable_columns_for(p_form_id, v_user_id, p_sheet, p_direction) ec), '[]'::JSONB) ); -- 2.47.2