Skip to content

Commit f0017ff

Browse files
committed
Fixed things
1 parent 39d123c commit f0017ff

4 files changed

Lines changed: 23 additions & 8 deletions

File tree

app/controllers/orders_controller.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ class OrdersController < ApplicationController
22
before_action :logged_in_user, only: %i[index show new create]
33

44
def index
5-
@orders = Order.all
5+
# @orders = Order.all
6+
if params[:search]
7+
@orders = Order.search(params[:search]).order('created_at ASC').paginate(page: params[:page], per_page: 5)
8+
else
9+
@orders = Order.all.order('created_at ASC').paginate(page: params[:page], per_page: 5)
10+
end
611
end
712

813
def show

app/models/order.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
class Order < ApplicationRecord
22
has_many :line_items, dependent: :destroy
3+
4+
def self.search(search)
5+
where('name LIKE ?', "%#{search}%")
6+
end
37
end

app/views/orders/index.html.erb

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,22 @@
22
<h2>Orders</h2>
33
</div>
44

5+
<!-- <div class="input-group" id="adv-search">
6+
<%= form_tag(orders_path, :method => "get", id: "search-form") do %>
7+
<%= text_field_tag :search, params[:search], placeholder: "Search by user email..." , class: "form-control" %>
8+
<%= submit_tag "Search" , class: "form_submit" , type: "button"%>
9+
<% end %>
10+
</div> -->
11+
512
<% @orders.each do |order| %>
613

7-
<% if @current_user.admin? %>
14+
<% if @current_user.admin? %>
815

9-
<%= render 'order' , :order => order%>
16+
<%= render 'order' , :order => order%>
1017

1118
<% elsif order.user_id == @current_user.id %>
1219

13-
<%= render 'order' , :order => order%>
20+
<%= render 'order' , :order => order%>
1421
1522
<%end%>
1623
<% end %>

app/views/users/index.html.erb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
<% provide(:title, 'All users') %>
2-
<h1>All users (<%= @users.count %>)</h3>
3-
</h1>
2+
<h1>All users (<%= @users.count %>)</h1>
43

54
<div class="input-group" id="adv-search">
65
<%= form_tag(users_path, :method => "get", id: "search-form") do %>
7-
<%= text_field_tag :search, params[:search], placeholder: "Search..." , class: "form-control" %>
6+
<%= text_field_tag :search, params[:search], placeholder: "Search by user name..." , class: "form-control" %>
87
<%= submit_tag "Search" , class: "form_submit" , type: "button"%>
98
<% end %>
109
</div>
1110

1211
<%= will_paginate %>
1312

1413
<ul class="users">
15-
<%= render @users %>
14+
<%= render @users %>
1615
</ul>
1716

1817
<%= will_paginate %>

0 commit comments

Comments
 (0)