Resourcified boards.

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

7 files changed, 32 insertions, 19 deletions

diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 36b0e233c..f9a507e6b 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -62,23 +62,34 @@ class BoardsController < ApplicationController
     end
   end
 
-  verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :index }
-
   def new
-    @board = Board.new(params[:board])
-    @board.project = @project
-    if request.post? && @board.save
+    @board = @project.boards.build(params[:board])
+  end
+
+  verify :method => :post, :only => :create, :redirect_to => { :action => :index }
+  def create
+    @board = @project.boards.build(params[:board])
+    if @board.save
       flash[:notice] = l(:notice_successful_create)
       redirect_to_settings_in_projects
+    else
+      render :action => 'new'
     end
   end
 
   def edit
-    if request.post? && @board.update_attributes(params[:board])
+  end
+
+  verify :method => :put, :only => :update, :redirect_to => { :action => :index }
+  def update
+    if @board.update_attributes(params[:board])
       redirect_to_settings_in_projects
+    else
+      render :action => 'edit'
     end
   end
 
+  verify :method => :delete, :only => :destroy, :redirect_to => { :action => :index }
   def destroy
     @board.destroy
     redirect_to_settings_in_projects
diff --git a/app/views/boards/_form.html.erb b/app/views/boards/_form.html.erb
index 7ede589ab..d80c84717 100644
--- a/app/views/boards/_form.html.erb
+++ b/app/views/boards/_form.html.erb
@@ -1,8 +1,6 @@
-<%= error_messages_for 'board' %>
+<%= f.error_messages %>
 
-<!--[form:board]-->
-<div class="box">
+<div class="box tabular">
 <p><%= f.text_field :name, :required => true %></p>
 <p><%= f.text_field :description, :required => true, :size => 80 %></p>
 </div>
-<!--[eoform:board]-->
diff --git a/app/views/boards/edit.html.erb b/app/views/boards/edit.html.erb
index ba4c8b5ac..9e94c25cd 100644
--- a/app/views/boards/edit.html.erb
+++ b/app/views/boards/edit.html.erb
@@ -1,6 +1,6 @@
 <h2><%= l(:label_board) %></h2>
 
-<% labelled_tabular_form_for :board, @board, :url => {:action => 'edit', :id => @board} do |f| %>
+<% labelled_form_for @board, :url => project_board_path(@project, @board) do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_save) %>
 <% end %>
diff --git a/app/views/boards/new.html.erb b/app/views/boards/new.html.erb
index b89121880..68eb1a33c 100644
--- a/app/views/boards/new.html.erb
+++ b/app/views/boards/new.html.erb
@@ -1,6 +1,6 @@
 <h2><%= l(:label_board_new) %></h2>
 
-<% labelled_tabular_form_for :board, @board, :url => {:action => 'new'} do |f| %>
+<% labelled_form_for @board, :url => project_boards_path(@project) do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_create) %>
 <% end %>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 34ccba9d6..6441c5ce3 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,4 +1,4 @@
-<%= breadcrumb link_to(l(:label_board_plural), {:controller => 'boards', :action => 'index', :project_id => @project}) %>
+<%= breadcrumb link_to(l(:label_board_plural), project_boards_path(@project)) %>
 
 <div class="contextual">
 <%= link_to_if_authorized l(:label_message_new),
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index c78856f73..272772737 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -1,5 +1,5 @@
-<%= breadcrumb link_to(l(:label_board_plural), {:controller => 'boards', :action => 'index', :project_id => @project}),
-               link_to(h(@board.name), {:controller => 'boards', :action => 'show', :project_id => @project, :id => @board}) %>
+<%= breadcrumb link_to(l(:label_board_plural), project_boards_path(@project)),
+               link_to(h(@board.name), project_board_path(@project, @board)) %>
 
 <div class="contextual">
     <%= watcher_tag(@topic, User.current) %>
diff --git a/app/views/projects/settings/_boards.html.erb b/app/views/projects/settings/_boards.html.erb
index fc5fe96c0..66a838a4e 100644
--- a/app/views/projects/settings/_boards.html.erb
+++ b/app/views/projects/settings/_boards.html.erb
@@ -14,12 +14,14 @@
     <td><%=h board.description %></td>
     <td align="center">
     <% if authorize_for("boards", "edit") %>
-      <%= reorder_links('board', {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board}) %>
+      <%= reorder_links('board', {:controller => 'boards', :action => 'update', :project_id => @project, :id => board}, :put) %>
     <% end %>
     </td>
     <td class="buttons">
-      <%= link_to_if_authorized l(:button_edit), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board}, :class => 'icon icon-edit' %>
-      <%= link_to_if_authorized l(:button_delete), {:controller => 'boards', :action => 'destroy', :project_id => @project, :id => board}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+    <% if User.current.allowed_to?(:manage_boards, @project) %>
+      <%= link_to l(:button_edit), edit_project_board_path(@project, board), :class => 'icon icon-edit' %>
+      <%= link_to l(:button_delete), project_board_path(@project, board), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
+		<% end %>
     </td>
   </tr>
 <% end %>
@@ -29,4 +31,6 @@
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
 
-<p><%= link_to_if_authorized l(:label_board_new), {:controller => 'boards', :action => 'new', :project_id => @project}, :class => 'icon icon-add' %></p>
+<% if User.current.allowed_to?(:manage_boards, @project) %>
+<p><%= link_to l(:label_board_new), new_project_board_path(@project), :class => 'icon icon-add' %></p>
+<% end %>