refinerycms-jobs 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2aa9ae56f6c89ca251060d91bbe58bb829d6bab
-  data.tar.gz: c8f3424a74df86f58cc5b4067a512ad2785dba42
+  metadata.gz: f49428ee75b5231b5a1e16a23cdd00a2968883a4
+  data.tar.gz: 67068ee5f21b912f94794ebcaeaacbba952e4741
 SHA512:
-  metadata.gz: 69a1889f0a6108f945d6d35c1f69279a02f4665903d62b5e091936f8f9a5e63c71b0e93f7fe3d92e653c1fb3fecc56623c2109c338565deb3bdf6174085c1109
-  data.tar.gz: 19f07fe132997d8c6be4ba1949a5331de058402cbc25e7ff2845730108d7d09e5aee63d18c1ad55940e538d70a5d7dbd91c2d23557e040981194a43ff66738b3
+  metadata.gz: 1863462ed7ac02cf97d4a2f270a9ee40b458d5e5583df1c0bf0c28a86b9d55096922635a77de1a7b55d736a8ac63ac00f88cfd92201e90936416cb065c0ae1d6
+  data.tar.gz: 33c4962d19b7516905d746e1a55ee76b54c1c734d5ca505acf37b52a98b1361891465bbe7b305974543d56edc75c4dce2a2466ddc747e5113def028ed6228f02

data/app/controllers/refinery/jobs/admin/jobs_controller.rb

@@ -6,12 +6,14 @@ module Refinery
                 order: 'position ASC',
                 include: [:translations, :job_applications]
 
-        private
+        protected
 
         def job_params
           params.require(:job).permit permitted_job_params
         end
 
+        private
+
         def permitted_job_params
           [
             :title, :description, :employment_terms, :hours, :position, :draft, :published_at, :fill,

data/app/controllers/refinery/jobs/job_applications_controller.rb

@@ -12,7 +12,7 @@ module Refinery
 
       def create
         @job_application = Refinery::Jobs::JobApplication.new(job_application_params)
-        @job_application.job_id = @job.id
+        @job_application.job_id ||= @job.id
 
         if !@job_application.job_id.nil?
           if @job_application.save
@@ -32,7 +32,7 @@ module Refinery
               end
             end
 
-            redirect_to refinery.jobs_job_job_application_path(params[:job_id], @job_application)
+            redirect_to refinery.jobs_job_job_application_path(@job, @job_application)
           else
             render action: 'new'
           end
@@ -44,7 +44,7 @@ module Refinery
       protected
 
       def find_job
-        @job = Refinery::Jobs::Job.live.friendly.find(params[:job_id])
+        @job = Refinery::Jobs::Job.live.friendly.find(params[:job_id] || params[:job_application][:job_id])
       end
 
       def find_page

data/app/models/refinery/jobs/job.rb

@@ -53,14 +53,6 @@ module Refinery
                            .readonly(false)
         end
 
-        def find_by_slug_or_id(slug_or_id)
-          if slug_or_id.friendly_id?
-            find_by_slug(slug_or_id)
-          else
-            find(slug_or_id)
-          end
-        end
-
         def published_before(date=DateTime.now)
           where(arel_table[:published_at].lt(date))
             .where(draft: false)

data/app/views/refinery/jobs/job_applications/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for [refinery, :jobs, @job, @job_application], html: { multipart: true } do |f| %>
+<%= form_for [refinery, job_application], url: refinery.jobs_job_applications_path, html: { multipart: true } do |f| %>
 
   <h2><%= t('.job_application_for_position', job_title: @job.title) %></h2>
 
@@ -19,11 +19,15 @@
     <%= f.telephone_field :phone, class: 'text', required: 'required' %>
   </div>
 
-  <% if @jobs %>
-    <div class='field'>
-      <%= f.label :job_id %>
-      <%= f.select :job_id, @jobs.collect {|j| [ j.title, j.id ] }, { prompt: t('.select_a_job') }, required: true %>
-    </div>
+  <% if !jobs.nil? %>
+    <% if jobs.many? %>
+      <div class='field'>
+        <%= f.label :job_id, class: 'required' %>
+        <%= f.select :job_id, jobs.collect {|j| [ j.title, j.id ] }, { prompt: t('select_a_job') }, required: true %>
+      </div>
+    <% else %>
+      <%= f.hidden_field :job_id, value: jobs.first.id %>
+    <% end %>
   <% end %>
 
   <div class='field'>

data/config/routes.rb

@@ -2,6 +2,8 @@ Refinery::Core::Engine.routes.draw do
   namespace :jobs, path: Refinery::Jobs.page_url do
     root to: "jobs#index"
 
+    resources :job_applications, only: [:new, :create]
+
     resources :jobs, path: '', only: [:index, :show] do
       resources :job_applications, only: [:new, :create, :show]
     end

data/refinerycms-jobs.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path('../lib', __FILE__)
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.name              = %q{refinerycms-jobs}
-  s.version           = '3.0.1'
+  s.version           = '3.0.2'
   s.summary           = %q{Ruby on Rails jobs engine for Refinery CMS.}
   s.description       = %q{Open source Ruby on Rails jobs engine designed for integration with Refinery CMS.}
   s.email             = %q{}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-jobs
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Brice Sanchez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core