Merge pull request #4860 from KarimQaderi/fix-action-datagrid-plus-for-persian-or-arabic
Fix bug action datagrid plus for persian or arabic
This commit is contained in:
commit
6a3e5c539f
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"/js/ui.js": "/js/ui.js?id=37bd4257e03367bb39c4",
|
||||
"/js/ui.js": "/js/ui.js?id=ced6a4796cf138d5cb34",
|
||||
"/css/ui.css": "/css/ui.css?id=6d93a4a052e38d6aa795"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
namespace Webkul\Ui\DataGrid;
|
||||
|
||||
use Illuminate\Support\Str;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
use Webkul\Ui\DataGrid\Traits\ProvideBouncer;
|
||||
use Webkul\Ui\DataGrid\Traits\ProvideCollection;
|
||||
|
|
@ -283,6 +284,8 @@ abstract class DataGrid
|
|||
$this->checkPermissions($action, $specialPermission, function ($action, $eventName) {
|
||||
$this->fireEvent('action.before.' . $eventName);
|
||||
|
||||
$action['key'] = Str::slug($action['title'], '_');
|
||||
|
||||
$this->actions[] = $action;
|
||||
$this->enableAction = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
namespace Webkul\Ui\DataGrid\Traits;
|
||||
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
trait ProvideCollection
|
||||
{
|
||||
use ProvideQueryResolver, ProvideQueryStringParser;
|
||||
|
|
@ -283,8 +285,8 @@ trait ProvideCollection
|
|||
*/
|
||||
private function generateKeyFromActionTitle($title, $suffix)
|
||||
{
|
||||
$validatedStrings = preg_replace('/[^A-Za-z0-9]+/', '_', $title);
|
||||
$validatedStrings = Str::slug($title, '_');
|
||||
|
||||
return strtolower($validatedStrings) . $suffix;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue