mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Updated convertUnicodeDbSlug to use Patchwork if intl isn’t installed
This commit is contained in:
parent
863735a6e5
commit
9ac9c6f1bc
|
@ -7,7 +7,7 @@ use Watson\Validating\ValidatingTrait;
|
||||||
use App\Http\Traits\UniqueUndeletedTrait;
|
use App\Http\Traits\UniqueUndeletedTrait;
|
||||||
use ForceUTF8\Encoding;
|
use ForceUTF8\Encoding;
|
||||||
use EasySlugger\Utf8Slugger;
|
use EasySlugger\Utf8Slugger;
|
||||||
|
use Patchwork\Utf8;
|
||||||
|
|
||||||
class CustomField extends Model
|
class CustomField extends Model
|
||||||
{
|
{
|
||||||
|
@ -37,7 +37,7 @@ class CustomField extends Model
|
||||||
|
|
||||||
public static function boot()
|
public static function boot()
|
||||||
{
|
{
|
||||||
self::creating(function ($custom_field)
|
self::created(function ($custom_field)
|
||||||
{
|
{
|
||||||
|
|
||||||
\Log::debug("\n\nCreating Original Name: ".$custom_field->name);
|
\Log::debug("\n\nCreating Original Name: ".$custom_field->name);
|
||||||
|
@ -53,6 +53,9 @@ class CustomField extends Model
|
||||||
$table->text($custom_field->convertUnicodeDbSlug())->nullable();
|
$table->text($custom_field->convertUnicodeDbSlug())->nullable();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$custom_field->db_column = $custom_field->convertUnicodeDbSlug();
|
||||||
|
$custom_field->save();
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -170,8 +173,16 @@ class CustomField extends Model
|
||||||
public function convertUnicodeDbSlug($original = null)
|
public function convertUnicodeDbSlug($original = null)
|
||||||
{
|
{
|
||||||
$name = $original ? $original : $this->name;
|
$name = $original ? $original : $this->name;
|
||||||
$slug = '_snipeit_'.Utf8Slugger::slugify($name,'_');
|
$id = $this->id ? $this->id : 'xx';
|
||||||
return $slug;
|
|
||||||
|
if (!function_exists('transliterator_transliterate')) {
|
||||||
|
$long_slug = str_slug('_snipeit_'.\Patchwork\Utf8::utf8_encode(trim($name)),'_');
|
||||||
|
} else {
|
||||||
|
$long_slug = '_snipeit_'.Utf8Slugger::slugify($name,'_');
|
||||||
|
}
|
||||||
|
|
||||||
|
return substr($long_slug, 0, 50).'_'.$id;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue