shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #1379 Fixed: App delete link show wrong name

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-03-25 16:23:19 +03:00
parent e3e775d990
commit da5f7f5d5e
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
resources/views/partials/form/delete_button.blade.php
View File

@ -10,11 +10,22 @@
} }
$text = $text ? $text : $page; $text = $text ? $text : $page;
$title = trans_choice('general.' . $text, 2);
$type = mb_strtolower(trans_choice('general.' . $text, 1));
// for module
if (\Str::contains($text, ['::'])) {
$title = trans_choice($text, 2);
$type = mb_strtolower(trans_choice($text, 1));
}
$message = trans('general.delete_confirm', ['name' => '<strong>' . $name . '</strong>', 'type' => $type]);
@endphp @endphp
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i> ' . trans('general.delete'), array( {!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i> ' . trans('general.delete'), array(
'type' => 'button', 'type' => 'button',
'class' => 'btn btn-danger btn-xs', 'class' => 'btn btn-danger btn-xs',
'title' => trans('general.delete'), 'title' => trans('general.delete'),
'@click' => 'confirmDelete("' . $url . '", "' . trans_choice('general.' . $text, 2) . '", "' . trans('general.delete_confirm', ['name' => '<strong>' . $item->$value . '</strong>', 'type' => mb_strtolower(trans_choice('general.' . $text, 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")' '@click' => 'confirmDelete("' . $url . '", "' . $title . '", "' . $message . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
)) !!} )) !!}

13
resources/views/partials/form/delete_link.blade.php
View File

@ -12,11 +12,22 @@
$text = $text ? $text : $page; $text = $text ? $text : $page;
$name = addslashes($item->$value); $name = addslashes($item->$value);
$title = trans_choice('general.' . $text, 2);
$type = mb_strtolower(trans_choice('general.' . $text, 1));
// for module
if (\Str::contains($text, ['::'])) {
$title = trans_choice($text, 2);
$type = mb_strtolower(trans_choice($text, 1));
}
$message = trans('general.delete_confirm', ['name' => '<strong>' . $name . '</strong>', 'type' => $type]);
@endphp @endphp
{!! Form::button(trans('general.delete'), array( {!! Form::button(trans('general.delete'), array(
'type' => 'button', 'type' => 'button',
'class' => 'dropdown-item action-delete', 'class' => 'dropdown-item action-delete',
'title' => trans('general.delete'), 'title' => trans('general.delete'),
'@click' => 'confirmDelete("' . $url . '", "' . trans_choice('general.' . $text, 2) . '", "' . trans('general.delete_confirm', ['name' => '<strong>' . $name . '</strong>', 'type' => mb_strtolower(trans_choice('general.' . $text, 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")' '@click' => 'confirmDelete("' . $url . '", "' . $title . '", "' . $message . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
)) !!} )) !!}