DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed #4628 and #4590 - Illegal mix of collations for operation error when searching on some languages

Browse source
This commit is contained in:
snipe 2018-01-20 03:08:27 -08:00
parent dfb2b9b569
commit 86c0194e9a
4 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Models/Accessory.php
View file

@ -181,8 +181,7 @@ class Accessory extends SnipeModel
})->orWhere('accessories.name', 'LIKE', '%'.$search.'%')
->orWhere('accessories.model_number', 'LIKE', '%'.$search.'%')
->orWhere('accessories.order_number', 'LIKE', '%'.$search.'%')
->orWhere('accessories.purchase_cost', 'LIKE', '%'.$search.'%')
->orWhere('accessories.purchase_date', 'LIKE', '%'.$search.'%');
->orWhere('accessories.purchase_cost', '=', $search);
}
});
}

1
app/Models/Asset.php
View file

@ -827,7 +827,6 @@ class Asset extends Depreciable
->orWhere('assets.asset_tag', 'LIKE', '%'.$search.'%')
->orWhere('assets.serial', 'LIKE', '%'.$search.'%')
->orWhere('assets.order_number', 'LIKE', '%'.$search.'%')
->orWhere('assets.purchase_date', 'LIKE', '%'.$search.'%')
->orWhere('assets.purchase_cost', 'LIKE', '%'.$search.'%')
->orWhere('assets.notes', 'LIKE', '%'.$search.'%');
}

3
app/Models/Component.php
View file

@ -144,8 +144,7 @@ class Component extends SnipeModel
})->orWhere('components.name', 'LIKE', '%'.$search.'%')
->orWhere('components.order_number', 'LIKE', '%'.$search.'%')
->orWhere('components.serial', 'LIKE', '%'.$search.'%')
->orWhere('components.purchase_cost', 'LIKE', '%'.$search.'%')
->orWhere('components.purchase_date', 'LIKE', '%'.$search.'%');
->orWhere('components.purchase_cost', 'LIKE', '%'.$search.'%');
}
});
}

3
app/Models/Consumable.php
View file

@ -186,8 +186,7 @@ class Consumable extends SnipeModel
});
})->orWhere('consumables.name', 'LIKE', '%'.$search.'%')
->orWhere('consumables.order_number', 'LIKE', '%'.$search.'%')
->orWhere('consumables.purchase_cost', 'LIKE', '%'.$search.'%')
->orWhere('consumables.purchase_date', 'LIKE', '%'.$search.'%');
->orWhere('consumables.purchase_cost', 'LIKE', '%'.$search.'%');
}
});
}