Commit c0d6c155 by nnnghia98

solved comments

parent e653bf98
...@@ -2,6 +2,6 @@ class TopsController < ApplicationController ...@@ -2,6 +2,6 @@ class TopsController < ApplicationController
def index def index
@vn_cities = City.city_order.take(Settings.top.city.limit) @vn_cities = City.city_order.take(Settings.top.city.limit)
@industries = Industry.industry_order.take(Settings.top.city.limit) @industries = Industry.industry_order.take(Settings.top.city.limit)
@jobs = Job.latest_jobs.take(Settings.top.job.limit) @jobs = Job.latest_job.take(Settings.top.job.limit)
end end
end end
...@@ -37,7 +37,7 @@ class Job < ApplicationRecord ...@@ -37,7 +37,7 @@ class Job < ApplicationRecord
has_many :industry_jobs has_many :industry_jobs
has_many :industries, through: :industry_jobs has_many :industries, through: :industry_jobs
def self.latest_jobs def self.latest_job
@latest_jobs ||= Job.order(updated_at: :desc) @latest_job ||= Job.order(updated_at: :desc)
end end
end end
<div class="col-md-3"> <div class="col-md-3">
<div class="col-show"> <div class="col-show">
<%= link_to city.name, jobs_path %> (<%= (city.job_count) %>) <%= link_to "#{city.name} (#{city.job_count})", jobs_path %>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="col-show"> <div class="col-show">
<%= link_to industry.name, jobs_path %> (<%= (industry.job_count) %>) <%= link_to "#{industry.name} (#{industry.job_count})", jobs_path %>
</div> </div>
</div> </div>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</dl> </dl>
<dl class="job_data_row"> <dl class="job_data_row">
<dt>Location</dt> <dt>Location</dt>
<dd><%= job.cities.first.name %></dd> <dd><%= job.cities.first.try(:name) %></dd>
</dl> </dl>
</div> </div>
<button type="button" class="btn btn-outline-secondary">Favorite</button> <button type="button" class="btn btn-outline-secondary">Favorite</button>
......
<li class="page-item">
<%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, remote: remote, class: 'page-link' %>
</li>
<li class='page-item disabled'>
<%= link_to raw(t 'views.pagination.truncate'), '#', class: 'page-link' %>
</li>
<li class="page-item">
<%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, remote: remote, class: 'page-link' %>
</li>
<li class="page-item">
<%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, rel: 'next', remote: remote, class: 'page-link' %>
</li>
<% if page.current? %>
<li class="page-item active">
<%= content_tag :a, page, data: { remote: remote }, rel: page.rel, class: 'page-link' %>
</li>
<% else %>
<li class="page-item">
<%= link_to page, url, remote: remote, rel: page.rel, class: 'page-link' %>
</li>
<% end %>
<%= paginator.render do %>
<nav>
<ul class="pagination">
<%= first_page_tag unless current_page.first? %>
<%= prev_page_tag unless current_page.first? %>
<% each_page do |page| %>
<% if page.left_outer? || page.right_outer? || page.inside_window? %>
<%= page_tag page %>
<% elsif !page.was_truncated? -%>
<%= gap_tag %>
<% end %>
<% end %>
<%= next_page_tag unless current_page.last? %>
<%= last_page_tag unless current_page.last? %>
</ul>
</nav>
<% end %>
<li class="page-item">
<%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote, class: 'page-link' %>
</li>
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
<div class="job_data"> <div class="job_data">
<dl class="job_data_row"> <dl class="job_data_row">
<dt>Title</dt> <dt>Title</dt>
<dd><%= latest_jobs.title %></dd> <dd><%= latest_job.title %></dd>
</dl> </dl>
<dl class="job_data_row"> <dl class="job_data_row">
<dt>Short description</dt> <dt>Short description</dt>
<dd><%= truncate(latest_jobs.short_des, length: 250) %></dd> <dd><%= truncate(latest_job.short_des, length: 250) %></dd>
</dl> </dl>
<dl class="job_data_row"> <dl class="job_data_row">
<dt>Salary</dt> <dt>Salary</dt>
<dd><%= latest_jobs.salary %></dd> <dd><%= latest_job.salary %></dd>
</dl> </dl>
<dl class="job_data_row"> <dl class="job_data_row">
<dt>Location</dt> <dt>Location</dt>
<dd><%= latest_jobs.cities.first.name %></dd> <dd><%= latest_job.cities.first.try(:name) %></dd>
</dl> </dl>
</div> </div>
</div> </div>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<h3>Latest jobs</h3> <h3>Latest jobs</h3>
<div> <div>
<%= render partial: "shared/latest_jobs", collection: @jobs %> <%= render partial: "shared/latest_job", collection: @jobs %>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment