Some unrelated code cleanup.

This commit is contained in:
James Cole
2016-01-20 21:24:48 +01:00
parent d211555beb
commit cc9d1c4bfd
2 changed files with 3 additions and 4 deletions

View File

@@ -81,7 +81,7 @@ class CsvController extends Controller
} }
$keys = array_keys(Config::get('csv.roles')); $keys = array_keys(Config::get('csv.roles'));
foreach ($keys as $name) { foreach ($keys as $name) {
$availableRoles[$name] = trans('firefly.csv_column_' . $name);//$role['name']; $availableRoles[$name] = trans('firefly.csv_column_' . $name);
} }
ksort($availableRoles); ksort($availableRoles);
@@ -162,7 +162,7 @@ class CsvController extends Controller
Session::forget('csv-roles'); Session::forget('csv-roles');
Session::forget('csv-mapped'); Session::forget('csv-mapped');
Session::forget('csv-specifix'); Session::forget('csv-specifix');
SessioN::forget('csv-delimiter'); Session::forget('csv-delimiter');
// get list of supported specifix // get list of supported specifix
$specifix = []; $specifix = [];

View File

@@ -55,7 +55,7 @@
{{ ExpandedForm.checkbox('has_headers',1,null,{helpText: 'csv_header_help'|_}) }} {{ ExpandedForm.checkbox('has_headers',1,null,{helpText: 'csv_header_help'|_}) }}
{{ ExpandedForm.text('date_format','Ymd',{helpText: 'csv_date_help'|_}) }} {{ ExpandedForm.text('date_format','Ymd',{helpText: trans('firefly.csv_date_help', {dateExample: phpdate('Ymd')}) }) }}
{{ ExpandedForm.file('csv',{helpText: 'csv_csv_file_help'|_}) }} {{ ExpandedForm.file('csv',{helpText: 'csv_csv_file_help'|_}) }}
@@ -65,7 +65,6 @@
{{ ExpandedForm.select('csv_import_account', accounts, 0, {helpText: 'csv_import_account_help'|_} ) }} {{ ExpandedForm.select('csv_import_account', accounts, 0, {helpText: 'csv_import_account_help'|_} ) }}
{{ ExpandedForm.multiCheckbox('specifix', specifix) }} {{ ExpandedForm.multiCheckbox('specifix', specifix) }}