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

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2018-07-20 13:25:03 -07:00
parent aa9c0078a1 e1c095adca
commit 1956a16d1e
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Models/Consumable.php
View file

@ -156,6 +156,10 @@ class Consumable extends SnipeModel
return $this->belongsToMany('\App\Models\User', 'consumables_users', 'consumable_id', 'assigned_to')->count();
}
public function checkin_email()
{
return $this->category->checkin_email;
}
public function requireAcceptance()
{

2
app/Models/License.php
View file

@ -228,7 +228,7 @@ class License extends Depreciable
public function checkin_email()
{
return $this->model->category->checkin_email;
return $this->category->checkin_email;
}
public function requireAcceptance()

17
app/Models/Traits/Searchable.php
View file

@ -53,7 +53,7 @@ trait Searchable {
* @param string $search The search term
* @return array An array of search terms
*/
private function prepeareSearchTerms(string $search) {
private function prepeareSearchTerms($search) {
return explode(' OR ', $search);
}
@ -68,6 +68,8 @@ trait Searchable {
$table = $this->getTable();
$firstConditionAdded = false;
foreach($this->getSearchableAttributes() as $column) {
foreach($terms as $term) {
@ -80,6 +82,19 @@ trait Searchable {
continue;
}
/**
* We need to form the query properly, starting with a "where",
* otherwise the generated select is wrong.
*
* @todo This does the job, but is inelegant and fragile
*/
if (!$firstConditionAdded) {
$query = $query->where($table . '.' . $column, 'LIKE', '%'.$term.'%');
$firstConditionAdded = true;
continue;
}
$query = $query->orWhere($table . '.' . $column, 'LIKE', '%'.$term.'%');
}
}