Fix query
This commit is contained in:
		@@ -12,7 +12,9 @@ class Artistes extends CI_Controller {
 | 
			
		||||
    public function index(){
 | 
			
		||||
        $genre = $this->input->get('genre');
 | 
			
		||||
        $order = $this->input->get('order');
 | 
			
		||||
        $artists = $this->model_music->getArtists($genre, $order);
 | 
			
		||||
		$query = $this->input->get('query');
 | 
			
		||||
 | 
			
		||||
        $artists = $this->model_music->getArtists($genre, $order, $query);
 | 
			
		||||
        $genres = $this->model_music->researchtype();
 | 
			
		||||
 | 
			
		||||
        $is_logged_in = $this->session->userdata('logged_in');
 | 
			
		||||
 
 | 
			
		||||
@@ -13,7 +13,10 @@ class Music extends CI_Controller {
 | 
			
		||||
        $genre = $this->input->get('genre');
 | 
			
		||||
        $order = $this->input->get('order');
 | 
			
		||||
        $artist = $this->input->get('artist');
 | 
			
		||||
        $musics = $this->model_music->getMusics($genre, $order, $artist);
 | 
			
		||||
		$query = $this->input->get('query');
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        $musics = $this->model_music->getMusics($genre, $order, $artist, $query);
 | 
			
		||||
        $genres = $this->model_music->researchtype();
 | 
			
		||||
        $artists = $this->model_music->nameArtist();
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -16,10 +16,6 @@ class Model_music extends CI_Model {
 | 
			
		||||
            $this->db->where('genre.name', $genre);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		if(!empty($query)){
 | 
			
		||||
            $this->db->where('album.name', $query);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if(!empty($artist)){
 | 
			
		||||
            $this->db->where('artist.name', $artist);
 | 
			
		||||
        }
 | 
			
		||||
@@ -28,6 +24,10 @@ class Model_music extends CI_Model {
 | 
			
		||||
            $this->db->order_by('album.name', $order);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if(!empty($query)){
 | 
			
		||||
            $this->db->like('album.name', $query);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        $query = $this->db->get();
 | 
			
		||||
        return $query->result();
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -13,6 +13,7 @@
 | 
			
		||||
    <div id="filters" style="display: none;">
 | 
			
		||||
        <form method="GET" action="">
 | 
			
		||||
            <!-- Filtre par artiste -->
 | 
			
		||||
            <label for="">Artiste : </label>
 | 
			
		||||
            <select name="artist" id="artist" onchange="this.form.submit()">
 | 
			
		||||
                <option value=''>Tous</option>
 | 
			
		||||
                <?php foreach($artistes as $artiste): ?>
 | 
			
		||||
@@ -21,6 +22,7 @@
 | 
			
		||||
            </select>
 | 
			
		||||
 | 
			
		||||
            <!-- Filtre par genre -->
 | 
			
		||||
            <label for="">Genre : </label>
 | 
			
		||||
            <select name="genre" id="genre" onchange="this.form.submit()">
 | 
			
		||||
                <option value=''>Tous</option>
 | 
			
		||||
                <?php foreach($genres as $genre): ?>
 | 
			
		||||
@@ -29,6 +31,7 @@
 | 
			
		||||
            </select>
 | 
			
		||||
 | 
			
		||||
            <!-- Filtre par ordre -->
 | 
			
		||||
            <label for="">Ordre : </label>
 | 
			
		||||
            <select name="order" id="order" onchange="this.form.submit()">
 | 
			
		||||
                <option value="">Ordre :</option>
 | 
			
		||||
                <option value="asc" <?= isset($_GET['order']) && $_GET['order'] == 'asc' ? 'selected' : '' ?>>Croissant</option>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user