Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 14:34:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add type_id property to filterable

Browse Source
This commit is contained in:
David Bomba 2024-05-16 10:34:38 +10:00
parent 16138adaa7
commit 5d50b77dcc
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/ImportController.php
View File

@ -169,6 +169,9 @@ class ImportController extends Controller
$enc = mb_detect_encoding($data, mb_list_encodings(), true); $enc = mb_detect_encoding($data, mb_list_encodings(), true);
nlog("env");
nlog($enc);
if($enc !== false) { if($enc !== false) {
$data = mb_convert_encoding($data, "UTF-8", $enc); $data = mb_convert_encoding($data, "UTF-8", $enc);
} }

2
app/Services/Template/TemplateService.php
View File

@ -126,7 +126,7 @@ class TemplateService
$allowedTags = ['if', 'for', 'set', 'filter']; $allowedTags = ['if', 'for', 'set', 'filter'];
$allowedFilters = ['escape', 'e', 'upper', 'lower', 'capitalize', 'filter', 'length', 'merge','format_currency','map', 'join', 'first', 'date','sum']; $allowedFilters = ['escape', 'e', 'upper', 'lower', 'capitalize', 'filter', 'length', 'merge','format_currency','map', 'join', 'first', 'date','sum'];
$allowedFunctions = ['range', 'cycle', 'constant', 'date',]; $allowedFunctions = ['range', 'cycle', 'constant', 'date',];
$allowedProperties = []; $allowedProperties = ['type_id'];
$allowedMethods = ['img','t']; $allowedMethods = ['img','t'];
$policy = new \Twig\Sandbox\SecurityPolicy($allowedTags, $allowedFilters, $allowedFunctions, $allowedProperties, $allowedMethods); $policy = new \Twig\Sandbox\SecurityPolicy($allowedTags, $allowedFilters, $allowedFunctions, $allowedProperties, $allowedMethods);