RSHB/DFiP_Budget_planing
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix-editable-columns: пофиксил возвращение редактируемых колонок' (#76) from fix-editable-columns into test

Browse Source 
Reviewed-on: #76
This commit is contained in:
tsygankoviva 2026-08-07 09:11:03 +03:00
commit a06e625a25
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/alembic/versions/sql/0015_aggregates_fix.sql
View File

@ -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) 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) RETURNS TABLE(row_type character varying, depth integer, sort_order bigint, data jsonb)
LANGUAGE plpgsql LANGUAGE plpgsql
@ -1404,8 +1405,8 @@ BEGIN
END IF; END IF;
v_user_id := p_user_id; v_user_id := p_user_id;
IF p_user_id IS NOT NULL THEN IF p_user_id IS NULL THEN
v_user_id := v3.current_user_id; v_user_id := v3.current_user_id();
END IF; END IF;
RETURN QUERY RETURN QUERY
SELECT SELECT
@ -1413,15 +1414,15 @@ BEGIN
-1, -1,
0::BIGINT, 0::BIGINT,
jsonb_build_object( jsonb_build_object(
'user_id', p_user_id, 'user_id', v_user_id,
'role', v3.user_role_code(p_user_id), 'role', v3.user_role_code(v_user_id),
'sheet', p_sheet, 'sheet', p_sheet,
'editable', COALESCE( 'editable', COALESCE(
(SELECT jsonb_agg( (SELECT jsonb_agg(
jsonb_build_object('column', ec.column_key, jsonb_build_object('column', ec.column_key,
'closes_at', ec.closes_at) 'closes_at', ec.closes_at)
ORDER BY ec.column_key) 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) '[]'::JSONB)
); );