diff --git a/app/controllers/recruitments_controller.rb b/app/controllers/recruitments_controller.rb index 20d1178..0aa9314 100644 --- a/app/controllers/recruitments_controller.rb +++ b/app/controllers/recruitments_controller.rb @@ -442,10 +442,8 @@ class RecruitmentsController < PseudoSessionController def recruitment_dashboard if @profile.is_employer? @jobsposted = @profile.profile.recruitment_jobs.desc(:created_at) - @page = "/#{I18n.locale.to_s}" + Page.where(:module => "recruitment").first.url rescue "#" elsif @profile.is_employee? @applications = @profile.profile.employee_job_applications.desc(:created_at) - @page = "/#{I18n.locale.to_s}" + Page.where(:module => "recruitment").first.url rescue "#" end end diff --git a/app/views/recruitments/_employee_dashboard.html.erb b/app/views/recruitments/_employee_dashboard.html.erb index 6899955..8ebff2e 100644 --- a/app/views/recruitments/_employee_dashboard.html.erb +++ b/app/views/recruitments/_employee_dashboard.html.erb @@ -15,7 +15,13 @@ <% job = app.get_job %> <%= job.get_post_type_label.html_safe %> - " target="_blank"><%= job.job_title %> + + <% if job.post_type == "type1" %> + " target="_blank"><%= job.job_title %> + <% elsif job.post_type == "type2" %> + " target="_blank"><%= job.job_title %> + <% end %> + <%= job.employer_profile.company_name %> <%= app.created_at.strftime("%d %B %Y") %> diff --git a/app/views/recruitments/_employer_dashboard.html.erb b/app/views/recruitments/_employer_dashboard.html.erb index 7c95593..b326522 100644 --- a/app/views/recruitments/_employer_dashboard.html.erb +++ b/app/views/recruitments/_employer_dashboard.html.erb @@ -16,7 +16,12 @@ <% @jobsposted.each do |job| %> <%= job.get_post_type_label.html_safe %> - " target="_blank"><%= job.job_title %> + + <% if job.post_type == "type1" %> + " target="_blank"><%= job.job_title %> + <% elsif job.post_type == "type2" %> + " target="_blank"><%= job.job_title %> + <% end %> <%= job.created_at.strftime("%Y-%m-%d") %> <%= job.filled ? "Yes" : "No" %> diff --git a/config/locales/en.yml b/config/locales/en.yml index c8f2eb7..0192396 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -21,7 +21,7 @@ en: internship_title: Internship Title internship_description: Internship Description internship_conditions: Internship Conditions - stipend-title: Stipend Title + stipend-title: Stipend stipend_range: Stipend Range in: in min_qualification: Min Qualification