jro_apps/redmine Commit - r14955:fb6b565a1ec9

Forum list can be reordered with drag and drop (#12909)....

Jean-Philippe Lang -

r14955:fb6b565a1ec9

parent child

Context file:

r14955:fb6b565a1ec9

Collapse all files

app/controllers/boards_controller.rb +11 -2

@@ -87,9 +87,18 class BoardsController < ApplicationController
87	def update	87	def update
88	@board.safe_attributes = params[:board]	88	@board.safe_attributes = params[:board]
89	if @board.save	89	if @board.save
90	redirect_to_settings_in_projects	90	respond_to do \|format\|
		91	format.html {
		92	flash[:notice] = l(:notice_successful_update)
		93	redirect_to_settings_in_projects
		94	}
		95	format.js { render :nothing => true }
		96	end
91	else	97	else
92	render :action => 'edit'	98	respond_to do \|format\|
		99	format.html { render :action => 'edit' }
		100	format.js { render :nothing => true, :status => 422 }
		101	end
93	end	102	end
94	end	103	end
95		104

app/helpers/projects_helper.rb +13 0

@@ -100,6 +100,19 module ProjectsHelper
100	l("label_version_sharing_#{sharing}")	100	l("label_version_sharing_#{sharing}")
101	end	101	end
102		102
		103	def render_boards_tree(boards, parent=nil, level=0, &block)
		104	selection = boards.select {\|b\| b.parent == parent}
		105	return '' if selection.empty?
		106
		107	s = ''.html_safe
		108	selection.each do \|board\|
		109	node = capture(board, level, &block)
		110	node << render_boards_tree(boards, board, level+1, &block)
		111	s << content_tag('div', node)
		112	end
		113	content_tag('div', s, :class => 'sort-level')
		114	end
		115
103	def render_api_includes(project, api)	116	def render_api_includes(project, api)
104	api.array :trackers do	117	api.array :trackers do
105	project.trackers.each do \|tracker\|	118	project.trackers.each do \|tracker\|

app/helpers/routes_helper.rb +4 0

                   new_time_entry_path(*args)
                 end
               end
+              def board_path(board, *args)
+                project_board_path(board.project, board, *args)
+              end
             end

app/models/board.rb +1 -1

                 where(Project.allowed_to_condition(args.shift || User.current, :view_messages, *args))
               }
-              safe_attributes 'name', 'description', 'parent_id', 'move_to'
+              safe_attributes 'name', 'description', 'parent_id', 'position'
               def visible?(user=User.current)
                 !user.nil? && user.allowed_to?(:view_messages, project)

app/views/projects/settings/_boards.html.erb +20 -23

@@ -1,32 +1,29
1	<% if @project.boards.any? %>	1	<% if @project.boards.any? %>
2	<table class="list">	2	<div class="table-list boards">
3	<thead><tr>	3	<div class="table-list-header">
4	<th><%= l(:label_board) %></th>	4	<div class="table-list-cell"><%= l(:label_board) %></div>
5	<th><%= l(:field_description) %></th>	5	</div>
6	<th></th>	6	<%= render_boards_tree(@project.boards) do \|board, level\| %>
7	<th></th>	7	<div class="table-list-row <%= cycle 'odd', 'even' %>">
8	</tr></thead>	8	<div class="table-list-cell name" style="padding-left: <%= 2 + level * 16 %>px">
9	<tbody>	9	<%= link_to board.name, project_board_path(@project, board) %>
10	<% Board.board_tree(@project.boards) do \|board, level\|	10	</div>
11	next if board.new_record? %>	11	<div class="table-list-cell description"><%= board.description %></div>
12	<tr class="<%= cycle 'odd', 'even' %>">	12	<div class="table-list-cell buttons">
13	<td class="name" style="padding-left: <%= level * 18 %>px;"><%= link_to board.name, project_board_path(@project, board) %></td>
14	<td class="description"><%= board.description %></td>
15	<td class="reorder">
16	<% if authorize_for("boards", "edit") %>
17	<%= reorder_links('board', {:controller => 'boards', :action => 'update', :project_id => @project, :id => board}, :put) %>
18	<% end %>
19	</td>
20	<td class="buttons">
21	<% if User.current.allowed_to?(:manage_boards, @project) %>	13	<% if User.current.allowed_to?(:manage_boards, @project) %>
		14	<%= reorder_handle(board) %>
22	<%= link_to l(:button_edit), edit_project_board_path(@project, board), :class => 'icon icon-edit' %>	15	<%= link_to l(:button_edit), edit_project_board_path(@project, board), :class => 'icon icon-edit' %>
23	<%= delete_link project_board_path(@project, board) %>	16	<%= delete_link project_board_path(@project, board) %>
24	<% end %>	17	<% end %>
25	</td>	18	</div>
26	</tr>	19	</div>
		20	<% end %>
		21	</div>
		22
		23	<%= javascript_tag do %>
		24	$(function() { $("div.sort-level").positionedItems(); });
27	<% end %>	25	<% end %>
28	</tbody>	26
29	</table>
30	<% else %>	27	<% else %>
31	<p class="nodata"><%= l(:label_no_data) %></p>	28	<p class="nodata"><%= l(:label_no_data) %></p>
32	<% end %>	29	<% end %>

public/javascripts/application.js +1 -1

                 return this.sortable($.extend({
                   handle: ".sort-handle",
                   helper: function(event, ui){
-                    ui.children().each(function(){
+                    ui.children('td').each(function(){
                       $(this).width($(this).width());
                     });
                     return ui;

public/stylesheets/application.css +9 -5

             a.toggle-checkboxes { margin-left: 5px; padding-left: 12px; background: url(../images/toggle_check.png) no-repeat 0% 50%; }
             /***** Tables *****/
-            table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
+            table.list, .table-list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
-            table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
+            table.list th, .table-list-header { background-color:#EEEEEE; padding: 4px; white-space:nowrap; font-weight:bold; }
             table.list td {text-align:center; vertical-align:top; padding-right:10px;}
             table.list td.id { width: 2%; text-align: center;}
             table.list td.name, table.list td.description, table.list td.subject, table.list td.comments, table.list td.roles {text-align: left;}
             table.list td.tick {width:15%}
             table.list td.checkbox { width: 15px; padding: 2px 0 0 0; }
             table.list td.checkbox input {padding:0px;}
-            table.list td.buttons { width: 15%; white-space:nowrap; text-align: right; }
+            table.list td.buttons, div.buttons { width: 15%; white-space:nowrap; text-align: right; }
-            table.list td.buttons a { margin-right: 0.6em; }
+            table.list td.buttons a, div.buttons a { margin-right: 0.6em; }
-            table.list td.buttons img {vertical-align:middle;}
+            table.list td.buttons img, div.buttons img {vertical-align:middle;}
             table.list td.reorder {width:15%; white-space:nowrap; text-align:center; }
             table.list table.progress td {padding-right:0px;}
             table.list caption { text-align: left; padding: 0.5em 0.5em 0.5em 0; }
+            .table-list-cell {display: table-cell; vertical-align: top; padding:2px; }
             tr.project td.name a { white-space:nowrap; }
             tr.project.closed, tr.project.archived { color: #aaa; }
             tr.project.closed a, tr.project.archived a { color: #aaa; }
             table.boards a.board, h3.comments { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; }
             table.boards td.last-message {text-align:left;font-size:80%;}
+            div.table-list.boards .table-list-cell.name {width: 30%;}
             table.messages td.last_message {text-align:left;}
             #query_form_content {font-size:90%;}

test/functional/boards_controller_test.rb +1 -1

               def test_update_position
                 @request.session[:user_id] = 2
-                put :update, :project_id => 1, :id => 2, :board => { :move_to => 'highest'}
+                put :update, :project_id => 1, :id => 2, :board => { :position => 1}
                 assert_redirected_to '/projects/ecookbook/settings/boards'
                 board = Board.find(2)
                 assert_equal 1, board.position

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages