Fixed navigation after removing report. Cleaned up report edit form

opsb · Mar 22, 2010 · d24bfa8 · d24bfa8
1 parent 1a16c32
commit d24bfa8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
@@ -54,6 +54,6 @@ def destroy
     @report = Report.find(params[:id])
     @report.destroy
     flash[:notice] = "Successfully destroyed report."
-    redirect_to reports_url
+    redirect_to database_url(@report.database)
   end
 end
diff --git a/app/views/reports/_form.html.erb b/app/views/reports/_form.html.erb
@@ -8,5 +8,8 @@
     <%= f.label :query %><br />
     <%= f.text_field :query %>
   </p>
-  <p><%= f.submit "Save" %></p>
+  <p>
+    <%= f.submit "Save" %>
+    <%= link_to "Cancel", @report %>
+  </p>
 <% end %>
diff --git a/app/views/reports/edit.html.erb b/app/views/reports/edit.html.erb
@@ -2,7 +2,4 @@
 
 <%= render :partial => 'form' %>
 
-<p>
-  <%= link_to "Show", @report %> |
-  <%= link_to "View All", database_reports_path(@database) %>
-</p>
+