Fix query 2/?
This commit is contained in:
parent
de08926fe7
commit
52d2ba512c
application
@ -55,16 +55,20 @@ class Model_music extends CI_Model {
|
|||||||
|
|
||||||
$this->db->distinct("artist.name");
|
$this->db->distinct("artist.name");
|
||||||
|
|
||||||
if(!empty($genre)){
|
if (!empty($genre)) {
|
||||||
$this->db->where('genre.name', $genre);
|
$this->db->where('genre.name', $genre);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($order == 'asc' || $order == 'desc'){
|
if ($order == 'asc' || $order == 'desc') {
|
||||||
$this->db->order_by('artist.name',$order );
|
$this->db->order_by('artist.name', $order);
|
||||||
}
|
}
|
||||||
|
|
||||||
$query = $this->db->get();
|
if (!empty($query)) {
|
||||||
return $query->result();
|
$this->db->like('artist.name', $query);
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $this->db->get();
|
||||||
|
return $result->result();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getMusics($genre = '', $order = '', $artist = '') {
|
public function getMusics($genre = '', $order = '', $artist = '') {
|
||||||
@ -77,20 +81,24 @@ class Model_music extends CI_Model {
|
|||||||
$this->db->join('cover', 'cover.id = album.coverid');
|
$this->db->join('cover', 'cover.id = album.coverid');
|
||||||
$this->db->limit(100);
|
$this->db->limit(100);
|
||||||
|
|
||||||
if(!empty($genre)){
|
if (!empty($genre)) {
|
||||||
$this->db->where('genre.name', $genre);
|
$this->db->where('genre.name', $genre);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!empty($artist)){
|
if (!empty($artist)) {
|
||||||
$this->db->where('artist.name', $artist);
|
$this->db->where('artist.name', $artist);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($order == 'asc' || $order == 'desc'){
|
if ($order == 'asc' || $order == 'desc') {
|
||||||
$this->db->order_by('song.name',$order );
|
$this->db->order_by('song.name', $order);
|
||||||
}
|
}
|
||||||
|
|
||||||
$query = $this->db->get();
|
if (!empty($query)) {
|
||||||
return $query->result();
|
$this->db->like('song.name', $query);
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $this->db->get();
|
||||||
|
return $result->result();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Suppression de la deuxième méthode researchtype
|
// Suppression de la deuxième méthode researchtype
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
<!-- Div contenant les filtres, cachée par défaut -->
|
<!-- Div contenant les filtres, cachée par défaut -->
|
||||||
<div id="filters" style="display: none;">
|
<div id="filters" style="display: none;">
|
||||||
<form method="GET" action="">
|
<form method="GET" action="">
|
||||||
|
|
||||||
<!-- Filtre par artiste -->
|
<!-- Filtre par artiste -->
|
||||||
<label for="">Artiste : </label>
|
<label for="">Artiste : </label>
|
||||||
<select name="artist" id="artist" onchange="this.form.submit()">
|
<select name="artist" id="artist" onchange="this.form.submit()">
|
||||||
@ -37,6 +38,7 @@
|
|||||||
<option value="asc" <?= isset($_GET['order']) && $_GET['order'] == 'asc' ? 'selected' : '' ?>>Croissant</option>
|
<option value="asc" <?= isset($_GET['order']) && $_GET['order'] == 'asc' ? 'selected' : '' ?>>Croissant</option>
|
||||||
<option value="desc" <?= isset($_GET['order']) && $_GET['order'] == 'desc' ? 'selected' : '' ?>>Décroissant</option>
|
<option value="desc" <?= isset($_GET['order']) && $_GET['order'] == 'desc' ? 'selected' : '' ?>>Décroissant</option>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user