Diff
Modified: trunk/app/controllers/jobs_controller.rb (2818 => 2819)
--- trunk/app/controllers/jobs_controller.rb 2011-11-17 00:16:52 UTC (rev 2818)
+++ trunk/app/controllers/jobs_controller.rb 2011-11-17 09:26:28 UTC (rev 2819)
@@ -143,7 +143,7 @@
respond_to do |format|
if success and @job.save
flash[:notice] = "Job successfully created."
- format.html { redirect_to job_url(@job.experiment, @job) }
+ format.html { redirect_to experiment_experiment_job_url(@job.experiment, @job) }
else
flash[:error] = err_msg if err_msg
format.html { render :action ="" "new" }
@@ -161,7 +161,7 @@
respond_to do |format|
if @job.update_attributes(params[:job])
flash[:notice] = "Job was successfully updated."
- format.html { redirect_to job_url(@experiment, @job) }
+ format.html { redirect_to experiment_job_url(@experiment, @job) }
else
format.html { render :action ="" "edit" }
end
@@ -172,10 +172,10 @@
respond_to do |format|
if @job.destroy
flash[:notice] = "Job \"address@hidden" has been deleted"
- format.html { redirect_to jobs_url(@experiment) }
+ format.html { redirect_to experiment_jobs_url(@experiment) }
else
flash[:error] = "Failed to delete Job"
- format.html { redirect_to job_url(@experiment, @job) }
+ format.html { redirect_to experiment_job_url(@experiment, @job) }
end
end
end
@@ -218,7 +218,7 @@
flash[:error] = "An error has occurred whilst saving the inputs data"
end
- format.html { redirect_to job_url(@experiment, @job) }
+ format.html { redirect_to experiment_job_url(@experiment, @job) }
end
end
@@ -250,10 +250,10 @@
respond_to do |format|
if success
flash[:notice] = "Job has been successfully submitted. You can monitor progress in the 'Status' section."
- format.html { redirect_to job_url(@experiment, @job) }
+ format.html { redirect_to experiment_job_url(@experiment, @job) }
else
flash[:error] = "Failed to submit job. Errors: " + errors_text
- format.html { redirect_to job_url(@experiment, @job) }
+ format.html { redirect_to experiment_job_url(@experiment, @job) }
end
end
end
@@ -279,7 +279,7 @@
else
respond_to do |format|
flash[:error] = "Outputs XML unavailable - Job not completed successfully yet."
- format.html { redirect_to job_url(@experiment, @job) }
+ format.html { redirect_to experiment_job_url(@experiment, @job) }
end
end
end
@@ -303,7 +303,7 @@
respond_to do |format|
if child_job.save
flash[:notice] = "Job successfully created, based on Job address@hidden'."
- format.html { redirect_to job_url(@experiment, child_job) }
+ format.html { redirect_to experiment_job_url(@experiment, child_job) }
else
format.html { render :action ="" "new" }
end
@@ -386,7 +386,7 @@
(err = Job.new.errors).add(attr, message)
respond_to do |format|
- format.html { redirect_to jobs_url(params[:experiment_id]) }
+ format.html { redirect_to experiment_jobs_url(params[:experiment_id]) }
end
end
end
Modified: trunk/app/views/experiments/_table.rhtml (2818 => 2819)
--- trunk/app/views/experiments/_table.rhtml 2011-11-17 00:16:52 UTC (rev 2818)
+++ trunk/app/views/experiments/_table.rhtml 2011-11-17 09:26:28 UTC (rev 2819)
@@ -36,7 +36,7 @@
<% if Authorization.is_authorized?('edit', nil, experiment, current_user) %>
<%= icon('edit', edit_experiment_path(experiment), nil, nil, 'Edit') %>
<% end %>
- <%= icon "job", new_job_path(experiment), nil, nil, "New Job" %>
+ <%= icon "job", new_experiment_job_path(experiment), nil, nil, "New Job" %>
</td>
</tr>
<% end %>
Modified: trunk/app/views/experiments/show.rhtml (2818 => 2819)
--- trunk/app/views/experiments/show.rhtml 2011-11-17 00:16:52 UTC (rev 2818)
+++ trunk/app/views/experiments/show.rhtml 2011-11-17 09:26:28 UTC (rev 2819)
@@ -55,7 +55,7 @@
<div class="tabTitle">Jobs</div>
<div class="tabContent">
<ul class="sectionIcons">
- <li><%= icon('new', new_job_path(@experiment), nil, nil, 'New Job') %></li>
+ <li><%= icon('new', new_experiment_job_path(@experiment), nil, nil, 'New Job') %></li>
</ul>
<% unless @experiment.jobs.empty? -%>
Modified: trunk/app/views/jobs/_breadcrumbs.rhtml (2818 => 2819)
--- trunk/app/views/jobs/_breadcrumbs.rhtml 2011-11-17 00:16:52 UTC (rev 2818)
+++ trunk/app/views/jobs/_breadcrumbs.rhtml 2011-11-17 09:26:28 UTC (rev 2819)
@@ -6,7 +6,7 @@
<li><%= link_to "#{h(@experiment.title)}", experiment_path(@experiment) -%></li>
<li><b>»</b></li>
- <li><%= link_to 'Jobs', jobs_path(@experiment) -%></li>
+ <li><%= link_to 'Jobs', experiment_jobs_path(@experiment) -%></li>
<% if ["show", "new", "edit"].include? controller.action_name.to_s -%>
<li><b>»</b></li>
@@ -16,7 +16,7 @@
<% when "new" %>
<li>New Job</li>
<% when "edit" %>
- <li><%= link_to "#{h(@job.title)}", job_path(@experiment, @job) -%></li>
+ <li><%= link_to "#{h(@job.title)}", experiment_job_path(@experiment, @job) -%></li>
<li><b>»</b></li>
<li>Manage</li>
<% else %>
Modified: trunk/app/views/jobs/_outputs.rhtml (2818 => 2819)
--- trunk/app/views/jobs/_outputs.rhtml 2011-11-17 00:16:52 UTC (rev 2818)
+++ trunk/app/views/jobs/_outputs.rhtml 2011-11-17 09:26:28 UTC (rev 2819)
@@ -2,7 +2,7 @@
<% outputs = job.outputs_data -%>
<% if false -%>
- <p><%= icon "package", outputs_package_job_path(experiment, job), nil, nil, "Download as compressed package" -%></p>
+ <p><%= icon "package", outputs_package_experiment_job_path(experiment, job), nil, nil, "Download as compressed package" -%></p>
<% end -%>
<p class="note_text" style="text-align: center;">
@@ -30,7 +30,7 @@
<h4>Download Data</h4>
<p>
- <%= icon "xml", outputs_xml_job_path(experiment, job), nil, nil, "Download as XML" -%>
+ <%= icon "xml", outputs_xml_experiment_job_path(experiment, job), nil, nil, "Download as XML" -%>
</p>
<p style="font-size: 93%; color: #666666; margin-left: 2em;">
You can open this XML file in the Taverna Data Viewer
Modified: trunk/app/views/jobs/_status_info.rhtml (2818 => 2819)
--- trunk/app/views/jobs/_status_info.rhtml 2011-11-17 00:16:52 UTC (rev 2818)
+++ trunk/app/views/jobs/_status_info.rhtml 2011-11-17 09:26:28 UTC (rev 2819)
@@ -18,7 +18,7 @@
</p>
<p>
- <% form_tag submit_job_job_path(experiment, job) do -%>
+ <% form_tag submit_job_experiment_job_path(experiment, job) do -%>
<center><%= submit_tag "Submit Job", :disable_with => "Submitting..." -%></center>
<% end -%>
</p>
@@ -109,9 +109,9 @@
<br/><br/>
<ul class="sectionIcons">
- <li><%= icon('rerun', rerun_job_path(experiment, job), nil, { :confirm => 'Note: this will create a new Job with the settings and input data copied from this Job. Continue?', :method => :post }, 'Rerun Job') %></li>
+ <li><%= icon('rerun', rerun_experiment_job_path(experiment, job), nil, { :confirm => 'Note: this will create a new Job with the settings and input data copied from this Job. Continue?', :method => :post }, 'Rerun Job') %></li>
</ul>
<% end -%>
-<% end -%>
\ No newline at end of file
+<% end -%>
Modified: trunk/app/views/jobs/_table.rhtml (2818 => 2819)
--- trunk/app/views/jobs/_table.rhtml 2011-11-17 00:16:52 UTC (rev 2818)
+++ trunk/app/views/jobs/_table.rhtml 2011-11-17 09:26:28 UTC (rev 2819)
@@ -11,7 +11,7 @@
<td class="mid" style="text-align: left;">
<p class="title">
<%= icon "job", nil, nil, nil, '' %>
- <%= link_to h(job.title), job_url(job.experiment, job) %>
+ <%= link_to h(job.title), experiment_experiment_job_url(job.experiment, job) %>
</p>
<p style="font-size: 85%; color: #666666;">
@@ -43,10 +43,10 @@
</td>
<td class="actions" style="width: 80px;">
- <%= icon "show", job_url(job.experiment, job), nil, nil, "View" %>
+ <%= icon "show", experiment_job_url(job.experiment, job), nil, nil, "View" %>
<% if false -%>
<% if Authorization.is_authorized?('edit', nil, job, current_user) -%>
- <%= icon('edit', edit_job_path(job.experiment, job), nil, nil, 'Edit') %>
+ <%= icon('edit', edit_experiment_job_path(job.experiment, job), nil, nil, 'Edit') %>
<% end -%>
<% end -%>
</td>
Modified: trunk/app/views/jobs/new.rhtml (2818 => 2819)
--- trunk/app/views/jobs/new.rhtml 2011-11-17 00:16:52 UTC (rev 2818)
+++ trunk/app/views/jobs/new.rhtml 2011-11-17 09:26:28 UTC (rev 2819)
@@ -6,7 +6,7 @@
<%= error_messages_for :job %>
</center>
-<% form_for :job, :url ="" (@job.experiment ? jobs_path(@job.experiment) : { :controller => 'jobs', :action ="" 'create' }) do |form| -%>
+<% form_for :job, :url ="" (@job.experiment ? experiment_jobs_path(@job.experiment) : { :controller => 'jobs', :action ="" 'create' }) do |form| -%>
<p class="sub-heading">
<% if @job.experiment -%>
@@ -86,4 +86,4 @@
</div>
</center>
-<% end -%>
\ No newline at end of file
+<% end -%>
Modified: trunk/app/views/jobs/show.rhtml (2818 => 2819)
--- trunk/app/views/jobs/show.rhtml 2011-11-17 00:16:52 UTC (rev 2818)
+++ trunk/app/views/jobs/show.rhtml 2011-11-17 09:26:28 UTC (rev 2819)
@@ -3,7 +3,7 @@
<% t "#{h @job.title}" -%>
<ul class="sectionIcons">
- <li><%= icon('rerun', rerun_job_path(@experiment, @job), nil, { :confirm => 'Note: this will create a new Job with the settings and input data copied from this Job. Continue?', :method => :post }, 'Rerun Job') %></li>
+ <li><%= icon('rerun', rerun_experiment_job_path(@experiment, @job), nil, { :confirm => 'Note: this will create a new Job with the settings and input data copied from this Job. Continue?', :method => :post }, 'Rerun Job') %></li>
</ul>
<h1>Job: <%= h @job.title %></h1>
@@ -118,7 +118,7 @@
<% unless @job.child_jobs.empty? -%>
<% @job.child_jobs.each do |j| -%>
<p>
- <%= link_to h(j.title), job_url(j.experiment, j) -%>
+ <%= link_to h(j.title), experiment_job_url(j.experiment, j) -%>
<span style="color: #666666;">(<%= datetime j.created_at -%>)</span>
</p>
<% end -%>
@@ -147,7 +147,7 @@
<br/>
- <% form_tag save_inputs_job_path(@experiment, @job), :multipart => true do -%>
+ <% form_tag save_inputs_experiment_job_path(@experiment, @job), :multipart => true do -%>
<% s_field_counter = 0 -%>
<% inputs.each do |i| -%>
@@ -287,7 +287,7 @@
<ul class="sectionIcons" style="margin-top: 1.5em;">
<li style="margin-left: 0;">
<%= link_to_remote "#{refresh_image} Refresh",
- :url ="" refresh_status_job_url(@experiment, @job),
+ :url ="" refresh_status_experiment_job_url(@experiment, @job),
:method => :get,
:update => 'status_box',
:success => "new Effect.Highlight('status_box', { duration: 1.5 });",
@@ -303,7 +303,7 @@
<p id="refresh_timer_text" class="note_text" style="text-align: center;">
Note: this section will automatically refresh every 10 seconds until job completion.
</p>
- <%= periodically_call_remote(:url ="" refresh_status_job_url(@experiment, @job),
+ <%= periodically_call_remote(:url ="" refresh_status_experiment_job_url(@experiment, @job),
:frequency => '10',
:update => 'status_box',
:method => :get,
@@ -330,7 +330,7 @@
<ul class="sectionIcons" style="margin-top: 1.5em;">
<li style="margin-left: 0;">
<%= link_to_remote "#{refresh_image} Refresh",
- :url ="" refresh_outputs_job_url(@experiment, @job),
+ :url ="" refresh_outputs_experiment_job_url(@experiment, @job),
:method => :get,
:update => 'outputs_box',
:success => "new Effect.Highlight('outputs_box', { duration: 1.5 });",