diff --git a/app/controllers/jobs_controller.rb b/app/controllers/jobs_controller.rb
index 0f06949..4a72bfb 100644
--- a/app/controllers/jobs_controller.rb
+++ b/app/controllers/jobs_controller.rb
@@ -19,7 +19,7 @@ class JobsController < ApplicationController
def update
if @job.update(remove_empty_time_budgets(job_params))
- redirect_to job_path(@job, project_id: @job.project.id)
+ redirect_to project_job_path(@job.project, @job)
else
render :edit
end
@@ -27,7 +27,7 @@ class JobsController < ApplicationController
def create
if @job = Job.create(job_params)
- redirect_to job_path(@job, project_id: @job.project.id)
+ redirect_to project_job_path(@job.project, @job)
else
render :edit
end
@@ -36,7 +36,7 @@ class JobsController < ApplicationController
def destroy
@project = @job.project
if @job.destroy
- redirect_to jobs_path(project_id: @project.id)
+ redirect_to project_jobs_path(@project)
else
render :show
end
diff --git a/app/models/job.rb b/app/models/job.rb
index 8157c1d..bcfa9a3 100644
--- a/app/models/job.rb
+++ b/app/models/job.rb
@@ -49,6 +49,6 @@ class Job < ActiveRecord::Base
def to_s
ActionView::Base.send(:include, Rails.application.routes.url_helpers)
- ActionController::Base.helpers.link_to name, ActionController::Base.helpers.job_path(self, project_id: project.id)
+ ActionController::Base.helpers.link_to name, ActionController::Base.helpers.project_job_path(project, self)
end
end
diff --git a/app/views/jobs/_job.html.erb b/app/views/jobs/_job.html.erb
index f3253b1..27bfcb6 100644
--- a/app/views/jobs/_job.html.erb
+++ b/app/views/jobs/_job.html.erb
@@ -1,5 +1,5 @@
- <%= link_to job.name, job_path(job, project_id: job.project_id) %> |
+ <%= link_to job.name, project_job_path(job.project, job) %> |
<%= format_date(job.starts_on) %> |
<%= format_date(job.ends_on) %> |
<%= job.project_id %> |
diff --git a/app/views/jobs/edit.html.erb b/app/views/jobs/edit.html.erb
index fe4d4aa..789d8a4 100644
--- a/app/views/jobs/edit.html.erb
+++ b/app/views/jobs/edit.html.erb
@@ -1,5 +1,5 @@
<% html_title "Edit #{@job.name}" %>
Edit <%= @job.name %>
-<%= render partial: "form", locals: { form_target: job_path(@job, project_id: @job.project) } %>
+<%= render partial: "form", locals: { form_target: project_job_path(@job.project, @job) } %>
diff --git a/app/views/jobs/index.html.erb b/app/views/jobs/index.html.erb
index a6e64e4..124d13d 100644
--- a/app/views/jobs/index.html.erb
+++ b/app/views/jobs/index.html.erb
@@ -1,6 +1,6 @@
<% html_title "Jobs" %>
- <%= link_to 'New job', new_job_path(project_id: @project.id), class: "icon icon-add new-job" %>
+ <%= link_to 'New job', new_project_job_path(project: @project), class: "icon icon-add new-job" %>
Jobs
diff --git a/app/views/jobs/new.html.erb b/app/views/jobs/new.html.erb
index e8c3843..18efd67 100644
--- a/app/views/jobs/new.html.erb
+++ b/app/views/jobs/new.html.erb
@@ -1,3 +1,3 @@
-<%= link_to "Jobs", jobs_path(project_id: @project.id) %> » New
+<%= link_to "Jobs", project_jobs_path(@project) %> » New
-<%= render partial: "form", locals: { form_target: jobs_path } %>
+<%= render partial: "form", locals: { form_target: project_jobs_path(@project) } %>
diff --git a/app/views/jobs/show.html.erb b/app/views/jobs/show.html.erb
index a61bdfa..72d428e 100644
--- a/app/views/jobs/show.html.erb
+++ b/app/views/jobs/show.html.erb
@@ -1,9 +1,9 @@
<% html_title @job.name %>
- <%= link_to 'Edit', edit_job_path(project_id: @project.id), class: "icon icon-edit edit-job" %>
+ <%= link_to 'Edit', edit_project_job_path(@project, @job), class: "icon icon-edit edit-job" %>
<%= actions_dropdown do %>
- <%= copy_object_url_link(job_url(@job, project_id: @project.id, only_path: false)) %>
- <%= link_to "Delete job", job_path(@job), data: { confirm: "Are you sure you want to delete this job?" }, method: :delete, class: 'icon icon-del' %>
+ <%= copy_object_url_link(project_job_url(@project, @job, only_path: false)) %>
+ <%= link_to "Delete job", project_job_path(@project, @job), data: { confirm: "Are you sure you want to delete this job?" }, method: :delete, class: 'icon icon-del' %>
<% end %>
Job #<%= @job.id %>
diff --git a/config/routes.rb b/config/routes.rb
index 2da398c..d8a7491 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1 +1,3 @@
-resources :jobs
+resources :projects do
+ resources :jobs
+end