Resourcified trackers.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7888 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/trackers_controller.rb

@@ -22,8 +22,6 @@ class TrackersController < ApplicationController
   before_filter :require_admin_or_api_request, :only => :index
   accept_api_auth :index
 
-  verify :method => :post, :only => :destroy, :redirect_to => { :action => :index }
-
   def index
     respond_to do |format|
       format.html {
@@ -37,6 +35,12 @@ class TrackersController < ApplicationController
   end
 
   def new
+    @tracker ||= Tracker.new(params[:tracker])
+    @trackers = Tracker.find :all, :order => 'position'
+    @projects = Project.find(:all)
+  end
+
+  def create
     @tracker = Tracker.new(params[:tracker])
     if request.post? and @tracker.save
       # workflow copy
@@ -47,20 +51,27 @@ class TrackersController < ApplicationController
       redirect_to :action => 'index'
       return
     end
-    @trackers = Tracker.find :all, :order => 'position'
-    @projects = Project.find(:all)
+    new
+    render :action => 'new'
   end
 
   def edit
+    @tracker ||= Tracker.find(params[:id])
+    @projects = Project.find(:all)
+  end
+  
+  def update
     @tracker = Tracker.find(params[:id])
-    if request.post? and @tracker.update_attributes(params[:tracker])
+    if request.put? and @tracker.update_attributes(params[:tracker])
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'index'
       return
     end
-    @projects = Project.find(:all)
+    edit
+    render :action => 'edit'
   end
 
+  verify :method => :delete, :only => :destroy, :redirect_to => { :action => :index }
   def destroy
     @tracker = Tracker.find(params[:id])
     unless @tracker.issues.empty?

app/helpers/application_helper.rb

@@ -391,19 +391,19 @@ module ApplicationHelper
     links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
   end
 
-  def reorder_links(name, url)
+  def reorder_links(name, url, method = :post)
     link_to(image_tag('2uparrow.png', :alt => l(:label_sort_highest)),
             url.merge({"#{name}[move_to]" => 'highest'}),
-            :method => :post, :title => l(:label_sort_highest)) +
+            :method => method, :title => l(:label_sort_highest)) +
     link_to(image_tag('1uparrow.png',   :alt => l(:label_sort_higher)),
             url.merge({"#{name}[move_to]" => 'higher'}),
-           :method => :post, :title => l(:label_sort_higher)) +
+           :method => method, :title => l(:label_sort_higher)) +
     link_to(image_tag('1downarrow.png', :alt => l(:label_sort_lower)),
             url.merge({"#{name}[move_to]" => 'lower'}),
-            :method => :post, :title => l(:label_sort_lower)) +
+            :method => method, :title => l(:label_sort_lower)) +
     link_to(image_tag('2downarrow.png', :alt => l(:label_sort_lowest)),
             url.merge({"#{name}[move_to]" => 'lowest'}),
-           :method => :post, :title => l(:label_sort_lowest))
+           :method => method, :title => l(:label_sort_lowest))
   end
 
   def breadcrumb(*args)

app/views/trackers/edit.html.erb

@@ -1,5 +1,5 @@
-<h2><%= link_to l(:label_tracker_plural), :controller => 'trackers', :action => 'index' %> &#187; <%=h @tracker %></h2>
+<h2><%= link_to l(:label_tracker_plural), trackers_path %> &#187; <%=h @tracker %></h2>
 
-<% form_for :tracker, @tracker, :url => { :action => 'edit' }, :builder => TabularFormBuilder do |f| %>
+<% form_for @tracker, :builder => TabularFormBuilder do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <% end %>

app/views/trackers/index.html.erb

@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= link_to l(:label_tracker_new), {:action => 'new'}, :class => 'icon icon-add' %>
+<%= link_to l(:label_tracker_new), new_tracker_path, :class => 'icon icon-add' %>
 </div>
 
 <h2><%=l(:label_tracker_plural)%></h2>
@@ -14,12 +14,12 @@
   <tbody>
 <% for tracker in @trackers %>
   <tr class="<%= cycle("odd", "even") %>">
-  <td><%= link_to h(tracker.name), :action => 'edit', :id => tracker %></td>
+  <td><%= link_to h(tracker.name), edit_tracker_path(tracker) %></td>
   <td align="center"><% unless tracker.workflows.count > 0 %><span class="icon icon-warning"><%= l(:text_tracker_no_workflow) %> (<%= link_to l(:button_edit), {:controller => 'workflows', :action => 'edit', :tracker_id => tracker} %>)</span><% end %></td>
-  <td align="center" style="width:15%;"><%= reorder_links('tracker', {:action => 'edit', :id => tracker}) %></td>
+  <td align="center" style="width:15%;"><%= reorder_links('tracker', {:action => 'update', :id => tracker}, :put) %></td>
   <td class="buttons">
-    <%= link_to(l(:button_delete), { :action => 'destroy', :id => tracker },
-                                   :method => :post,
+    <%= link_to(l(:button_delete), tracker_path(tracker),
+                                   :method => :delete,
                                    :confirm => l(:text_are_you_sure),
                                    :class => 'icon icon-del') %>
   </td>

app/views/trackers/new.html.erb

@@ -1,5 +1,5 @@
-<h2><%= link_to l(:label_tracker_plural), :controller => 'trackers', :action => 'index' %> &#187; <%=l(:label_tracker_new)%></h2>
+<h2><%= link_to l(:label_tracker_plural), trackers_path %> &#187; <%=l(:label_tracker_new)%></h2>
 
-<% form_for :tracker, @tracker, :url => { :action => 'new' }, :builder => TabularFormBuilder do |f| %>
+<% form_for @tracker, :builder => TabularFormBuilder do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <% end %>