mirror of
https://github.com/openclassify/openclassify.git
synced 2026-02-12 16:26:07 -06:00
added queryOrder function
This commit is contained in:
parent
dd3548d868
commit
f492342c47
@ -58,9 +58,8 @@ class AjaxController extends PublicController
|
||||
if ($this->request->id)
|
||||
return $this->country_model->find($this->request->id);
|
||||
else {
|
||||
$sorting_type = setting_value('visiosoft.module.location::sorting_type');
|
||||
$sorting_column = setting_value('visiosoft.module.location::sorting_column');
|
||||
return $this->country_model->orderBy($sorting_column, $sorting_type)->get();
|
||||
$query = $this->country_model;
|
||||
return $this->queryOrder($query);
|
||||
}
|
||||
}
|
||||
|
||||
@ -73,10 +72,7 @@ class AjaxController extends PublicController
|
||||
$id = explode(',', $this->request->id);
|
||||
$query = $this->city_model->whereIn('parent_country_id', $id);
|
||||
|
||||
$sorting_type = setting_value('visiosoft.module.location::sorting_type');
|
||||
$sorting_column = setting_value('visiosoft.module.location::sorting_column');
|
||||
|
||||
return $query->orderBy($sorting_column, $sorting_type)->get();
|
||||
return $this->queryOrder($query);
|
||||
}
|
||||
}
|
||||
|
||||
@ -90,10 +86,7 @@ class AjaxController extends PublicController
|
||||
|
||||
$query = $this->district_model->whereIn('parent_city_id', $id);
|
||||
|
||||
$sorting_type = setting_value('visiosoft.module.location::sorting_type');
|
||||
$sorting_column = setting_value('visiosoft.module.location::sorting_column');
|
||||
|
||||
return $query->orderBy($sorting_column, $sorting_type)->get();
|
||||
return $this->queryOrder($query);
|
||||
}
|
||||
}
|
||||
|
||||
@ -107,10 +100,7 @@ class AjaxController extends PublicController
|
||||
|
||||
$query = $this->neighborhood_model->whereIn('parent_district_id', $id);
|
||||
|
||||
$sorting_type = setting_value('visiosoft.module.location::sorting_type');
|
||||
$sorting_column = setting_value('visiosoft.module.location::sorting_column');
|
||||
|
||||
return $query->orderBy($sorting_column, $sorting_type)->get();
|
||||
return $this->queryOrder($query);
|
||||
}
|
||||
}
|
||||
|
||||
@ -124,11 +114,7 @@ class AjaxController extends PublicController
|
||||
|
||||
$query = $this->village_model->whereIn('parent_neighborhood_id', $id);
|
||||
|
||||
$sorting_type = setting_value('visiosoft.module.location::sorting_type');
|
||||
$sorting_column = setting_value('visiosoft.module.location::sorting_column');
|
||||
|
||||
return $query->orderBy($sorting_column, $sorting_type)->get();
|
||||
|
||||
return $this->queryOrder($query);
|
||||
}
|
||||
}
|
||||
|
||||
@ -146,4 +132,12 @@ class AjaxController extends PublicController
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public function queryOrder($query)
|
||||
{
|
||||
$sorting_type = setting_value('visiosoft.module.location::sorting_type');
|
||||
$sorting_column = setting_value('visiosoft.module.location::sorting_column');
|
||||
|
||||
return $query->orderBy($sorting_column, $sorting_type)->get();
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user