fig bugs

app/controllers/admins/applies_controller.rb

 class Admins::AppliesController < ApplicationController
 class Admins::AppliesController < ApplicationController
   def index
   def index
     @cities = City.pluck(:id, :name)
     @cities = City.pluck(:id, :name)
-    @applications = ApplyJob.applications.includes(:job, :user)
+    @applications = ApplyJob.includes(:job, :user)
   end
   end
 end
 end

app/models/apply_job.rb

@@ -4,7 +4,10 @@ class ApplyJob < ApplicationRecord
   validates_size_of :cv, maximum: 5.megabytes, message: 'size should be less than 5MB'
   validates_size_of :cv, maximum: 5.megabytes, message: 'size should be less than 5MB'
   validates :email, presence: true
   validates :email, presence: true
   validates :name, presence: true
   validates :name, presence: true
+<<<<<<< 132d97c26c67214fbdb21f17fdf70e66ae6c833b
 
 
   # CarrierWave
   # CarrierWave
   mount_uploader :cv, CvUploader
   mount_uploader :cv, CvUploader
+=======
+>>>>>>> fig bugs
 end
 end

app/views/admins/applies/_application.html.erb

-<div class="job-intro well mr0 mrBot20">
+<% @applications.each do |application| %>
+  <div class="job-intro well mr0 mrBot20">
     <h4 class="mr0"><%= link_to application.job.name, job_path(application.job) %></h4>
     <h4 class="mr0"><%= link_to application.job.name, job_path(application.job) %></h4>
     <p><%= "Candidate Name: #{application.user.name}" %></p>
     <p><%= "Candidate Name: #{application.user.name}" %></p>
     <p><%= "Candidate CV: #{application.user.cv}" %></p>
     <p><%= "Candidate CV: #{application.user.cv}" %></p>
@@ -6,4 +7,5 @@
       <span><%= "Candidate Email: #{application.user.email}" %></span>
       <span><%= "Candidate Email: #{application.user.email}" %></span>
       <span class="navbar-right"><%= "Applied at: #{application.created_at.strftime('%m/%d/%y')}" %></span>
       <span class="navbar-right"><%= "Applied at: #{application.created_at.strftime('%m/%d/%y')}" %></span>
     </p>
     </p>
-</div>
+  </div>
+<% end %>

app/views/admins/applies/index.html.erb

@@ -36,9 +36,7 @@
 
 
     <div class="col-md-12 jobs">
     <div class="col-md-12 jobs">
       <div class="panel border_bot clearfix">
       <div class="panel border_bot clearfix">
-        <% @applications.each do |application| %>
-          <%= render "admins/applies/application", application: application %>
-        <% end %>
+        <%= render "admins/applies/application", applications: @application %>
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>