Overview
Comment:Fix count
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | stable
Files: files | file ages | folders
SHA3-256: 406ac5da3e749750a8eabf6c394b2be00921a6b7b3100e3fd0449c060e89e8c7
User & Date: bohwaz on 2022-11-16 23:50:11
Other Links: manifest | tags
Context
2022-11-17
00:03
Fix check of incorrect accounting chart when saving transaction check-in: 43f36ef3d2 user: bohwaz tags: trunk, stable
2022-11-16
23:50
Fix count check-in: 406ac5da3e user: bohwaz tags: trunk, stable
23:17
Improve UX of account selector when there are zero accounts of the targeted types check-in: 9f5d88de31 user: bohwaz tags: trunk
Changes

Modified src/www/admin/acc/charts/accounts/_inc.php from [b2cdc3378d] to [133962891b].

15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

// Filter only some types (if coming from a selector)
if (qg('types')) {
	$types = explode(':', qg('types'));
	$types = array_map('intval', $types);
	$types_arg = 'types=' . implode(':', $types);

	$types_names = count($types) ? array_intersect_key(Account::TYPES_NAMES, array_flip($types)) : [];
	$types_names = implode(', ', $types_names);
}

$tpl->assign(compact('types_arg', 'dialog_target', 'types_names'));

function chart_reload_or_redirect(string $url)
{







|







15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

// Filter only some types (if coming from a selector)
if (qg('types')) {
	$types = explode(':', qg('types'));
	$types = array_map('intval', $types);
	$types_arg = 'types=' . implode(':', $types);

	$types_names = !empty($types) ? array_intersect_key(Account::TYPES_NAMES, array_flip($types)) : [];
	$types_names = implode(', ', $types_names);
}

$tpl->assign(compact('types_arg', 'dialog_target', 'types_names'));

function chart_reload_or_redirect(string $url)
{

Modified src/www/admin/acc/charts/accounts/selector.php from [3f60bd0fd2] to [d4eae49038].

73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
	$targets = null;
}

$accounts = $chart->accounts();

$edit_url = sprintf('!acc/charts/accounts/%s?id=%d&types=%s', isset($grouped_accounts) ? '' : 'all.php', $chart->id(), $targets_str);

$targets_names = count($targets) ? array_intersect_key(Account::TYPES_NAMES, array_flip($targets)) : [];
$targets_names = implode(', ', $targets_names);

$tpl->assign(compact('chart', 'targets', 'targets_str', 'filter_options', 'filter', 'edit_url', 'targets_names'));

if ($filter == 'all') {
	$tpl->assign('accounts', $accounts->listAll($targets));
}







|







73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
	$targets = null;
}

$accounts = $chart->accounts();

$edit_url = sprintf('!acc/charts/accounts/%s?id=%d&types=%s', isset($grouped_accounts) ? '' : 'all.php', $chart->id(), $targets_str);

$targets_names = !empty($targets) ? array_intersect_key(Account::TYPES_NAMES, array_flip($targets)) : [];
$targets_names = implode(', ', $targets_names);

$tpl->assign(compact('chart', 'targets', 'targets_str', 'filter_options', 'filter', 'edit_url', 'targets_names'));

if ($filter == 'all') {
	$tpl->assign('accounts', $accounts->listAll($targets));
}