jro_apps/redmine Commit - r913:29b3614bcb75

Forums enhancements:...

Jean-Philippe Lang -

r913:29b3614bcb75

parent child

Context file:

r913:29b3614bcb75

Collapse all files

app/views/messages/edit.rhtml created 644 +6 0

@@ -0,0 +1,6
	1	<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> » <%=h @message.subject %></h2>
	2
	3	<% form_for :message, @message, :url => {:action => 'edit'}, :html => {:multipart => true} do \|f\| %>
	4	<%= render :partial => 'form', :locals => {:f => f} %>
	5	<%= submit_tag l(:button_save) %>
	6	<% end %>

db/migrate/082_add_messages_locked.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddMessagesLocked < ActiveRecord::Migration
	2	def self.up
	3	add_column :messages, :locked, :boolean, :default => false
	4	end
	5
	6	def self.down
	7	remove_column :messages, :locked
	8	end
	9	end

db/migrate/083_add_messages_sticky.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddMessagesSticky < ActiveRecord::Migration
	2	def self.up
	3	add_column :messages, :sticky, :integer, :default => 0
	4	end
	5
	6	def self.down
	7	remove_column :messages, :sticky
	8	end
	9	end

public/images/sticky.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

test/functional/boards_controller_test.rb created 644 +50 0

@@ -0,0 +1,50
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19	require 'boards_controller'
	20
	21	# Re-raise errors caught by the controller.
	22	class BoardsController; def rescue_action(e) raise e end; end
	23
	24	class BoardsControllerTest < Test::Unit::TestCase
	25	fixtures :projects, :users, :members, :roles, :boards, :messages, :enabled_modules
	26
	27	def setup
	28	@controller = BoardsController.new
	29	@request = ActionController::TestRequest.new
	30	@response = ActionController::TestResponse.new
	31	User.current = nil
	32	end
	33
	34	def test_index
	35	get :index, :project_id => 1
	36	assert_response :success
	37	assert_template 'index'
	38	assert_not_nil assigns(:boards)
	39	assert_not_nil assigns(:project)
	40	end
	41
	42	def test_show
	43	get :show, :project_id => 1, :id => 1
	44	assert_response :success
	45	assert_template 'show'
	46	assert_not_nil assigns(:board)
	47	assert_not_nil assigns(:project)
	48	assert_not_nil assigns(:topics)
	49	end
	50	end

test/functional/messages_controller_test.rb created 644 +49 0

@@ -0,0 +1,49
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19	require 'messages_controller'
	20
	21	# Re-raise errors caught by the controller.
	22	class MessagesController; def rescue_action(e) raise e end; end
	23
	24	class MessagesControllerTest < Test::Unit::TestCase
	25	fixtures :projects, :users, :members, :roles, :boards, :messages, :enabled_modules
	26
	27	def setup
	28	@controller = MessagesController.new
	29	@request = ActionController::TestRequest.new
	30	@response = ActionController::TestResponse.new
	31	User.current = nil
	32	end
	33
	34	def test_show
	35	get :show, :board_id => 1, :id => 1
	36	assert_response :success
	37	assert_template 'show'
	38	assert_not_nil assigns(:board)
	39	assert_not_nil assigns(:project)
	40	assert_not_nil assigns(:topic)
	41	end
	42
	43	def test_reply
	44	@request.session[:user_id] = 2
	45	post :reply, :board_id => 1, :id => 1, :reply => { :content => 'This is a test reply', :subject => 'Test reply' }
	46	assert_redirected_to 'messages/show'
	47	assert Message.find_by_subject('Test reply')
	48	end
	49	end

app/controllers/boards_controller.rb +1 -1

                 @topic_count = @board.topics.count
                 @topic_pages = Paginator.new self, @topic_count, 25, params['page']
-                @topics =  @board.topics.find :all, :order => sort_clause,
+                @topics =  @board.topics.find :all, :order => "#{Message.table_name}.sticky DESC, #{sort_clause}",
                                               :include => [:author, {:last_reply => :author}],
                                               :limit  =>  @topic_pages.items_per_page,
                                               :offset =>  @topic_pages.current.offset

app/controllers/messages_controller.rb +45 -6

             class MessagesController < ApplicationController
               layout 'base'
-              before_filter :find_project, :authorize
+              before_filter :find_board, :only => :new
+              before_filter :find_message, :except => :new
+              before_filter :authorize
               verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
               helper :attachments
               include AttachmentsHelper
+              # Show a topic and its replies
               def show
                 @reply = Message.new(:subject => "RE: #{@message.subject}")
                 render :action => "show", :layout => false if request.xhr?
               end
+              # Create a new topic
               def new
                 @message = Message.new(params[:message])
                 @message.author = User.current
                 @message.board = @board
+                if params[:message] && User.current.allowed_to?(:edit_messages, @project)
+                  @message.locked = params[:message]['locked']
+                  @message.sticky = params[:message]['sticky']
+                end
                 if request.post? && @message.save
                   params[:attachments].each { |file|
                     Attachment.create(:container => @message, :file => file, :author => User.current) if file.size > 0
                 end
               end
+              # Reply to a topic
               def reply
                 @reply = Message.new(params[:reply])
                 @reply.author = User.current
                 @reply.board = @board
-                @message.children << @reply
+                @topic.children << @reply
                 if !@reply.new_record?
                   params[:attachments].each { |file|
                     Attachment.create(:container => @reply, :file => file, :author => User.current) if file.size > 0
                   } if params[:attachments] and params[:attachments].is_a? Array
                 end
-                redirect_to :action => 'show', :id => @message
+                redirect_to :action => 'show', :id => @topic
+              end
+              # Edit a message
+              def edit
+                if params[:message] && User.current.allowed_to?(:edit_messages, @project)
+                  @message.locked = params[:message]['locked']
+                  @message.sticky = params[:message]['sticky']
+                end
+                if request.post? && @message.update_attributes(params[:message])
+                  params[:attachments].each { |file|
+                    Attachment.create(:container => @message, :file => file, :author => User.current) if file.size > 0
+                  } if params[:attachments] and params[:attachments].is_a? Array
+                  flash[:notice] = l(:notice_successful_update)
+                  redirect_to :action => 'show', :id => @topic
+                end
+              end
+              # Delete a messages
+              def destroy
+                @message.destroy
+                redirect_to @message.parent.nil? ?
+                  { :controller => 'boards', :action => 'show', :project_id => @project, :id => @board } :
+                  { :action => 'show', :id => @message.parent }
               end
             private
-              def find_project
+              def find_message
+                find_board
+                @message = @board.messages.find(params[:id], :include => :parent)
+                @topic = @message.root
+              rescue ActiveRecord::RecordNotFound
+                render_404
+              end
+              def find_board
                 @board = Board.find(params[:board_id], :include => :project)
                 @project = @board.project
-                @message = @board.topics.find(params[:id]) if params[:id]
               rescue ActiveRecord::RecordNotFound
                 render_404
               end

app/helpers/application_helper.rb +2 -2

               # Display a link to user's account page
               def link_to_user(user)
-                link_to user.name, :controller => 'account', :action => 'show', :id => user
+                user ? link_to(user, :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
               end
               def link_to_issue(issue)
               def authoring(created, author)
                 time_tag = content_tag('acronym', distance_of_time_in_words(Time.now, created), :title => format_time(created))
-                l(:label_added_time_by, author.name, time_tag)
+                l(:label_added_time_by, author || 'Anonymous', time_tag)
               end
               def day_name(day)

app/models/message.rb +18 0

                             :description => :content,
                             :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id, :id => o.id}}
+              attr_protected :locked, :sticky
               validates_presence_of :subject, :content
               validates_length_of :subject, :maximum => 255
+              def validate_on_create
+                # Can not reply to a locked topic
+                errors.add_to_base 'Topic is locked' if root.locked?
+              end
               def after_create
                 board.update_attribute(:last_message_id, self.id)
                 board.increment! :messages_count
                 end
               end
+              def after_destroy
+                # The following line is required so that the previous counter
+                # updates (due to children removal) are not overwritten
+                board.reload
+                board.decrement! :messages_count
+                board.decrement! :topics_count unless parent
+              end
+              def sticky?
+                sticky == 1
+              end
               def project
                 board.project
               end

app/views/boards/index.rhtml +1 -1

                 <td>
                 <small>
                   <% if board.last_message %>
-                  <%= board.last_message.author.name %>, <%= format_time(board.last_message.created_on) %><br />
+                  <%= authoring board.last_message.created_on, board.last_message.author %><br />
                   <%= link_to_message board.last_message %>
                   <% end %>
                 </small>

app/views/boards/show.rhtml +8 -10

             <h2><%=h @board.name %></h2>
             <% if @topics.any? %>
-            <table class="list">
+            <table class="list messages">
               <thead><tr>
                 <th><%= l(:field_subject) %></th>
                 <th><%= l(:field_author) %></th>
               </tr></thead>
               <tbody>
               <% @topics.each do |topic| %>
-                <tr class="<%= cycle 'odd', 'even' %>">
+                <tr class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
-                  <td><%= link_to h(topic.subject), :controller => 'messages', :action => 'show', :board_id => @board, :id => topic %></td>
+                  <td class="subject"><%= link_to h(topic.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => topic }, :class => 'icon' %></td>
-                  <td align="center"><%= link_to_user topic.author %></td>
+                  <td class="author" align="center"><%= topic.author %></td>
-                  <td align="center"><%= format_time(topic.created_on) %></td>
+                  <td class="created_on" align="center"><%= format_time(topic.created_on) %></td>
-                  <td align="center"><%= topic.replies_count %></td>
+                  <td class="replies" align="center"><%= topic.replies_count %></td>
-                  <td>
+                  <td class="last_message">
-                  <small>
                     <% if topic.last_reply %>
-                    <%= topic.last_reply.author.name %>, <%= format_time(topic.last_reply.created_on) %><br />
+                    <%= authoring topic.last_reply.created_on, topic.last_reply.author %><br />
                     <%= link_to_message topic.last_reply %>
                     <% end %>
-                  </small>
                   </td>
                 </tr>
               <% end %>

app/views/messages/_form.rhtml +7 -1

             <div class="box">
             <!--[form:message]-->
             <p><label><%= l(:field_subject) %></label><br />
-            <%= f.text_field :subject, :required => true, :size => 120 %></p>
+            <%= f.text_field :subject, :required => true, :size => 120 %>
+            <% if User.current.allowed_to?(:edit_messages, @project) %>
+                <label><%= f.check_box :sticky %> Sticky</label>
+                <label><%= f.check_box :locked %> Locked</label>
+            <% end %>
+            </p>
             <p><%= f.text_area :content, :required => true, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'message_content' %></p>
             <%= wikitoolbar_for 'message_content' %>

app/views/messages/show.rhtml +18 -9

-            <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%=h @message.subject %></h2>
+            <div class="contextual">
+                <%= link_to_if_authorized l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'icon icon-edit' %>
+                <%= link_to_if_authorized l(:button_delete), {:action => 'destroy', :id => @topic}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del' %>
+            </div>
+            <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%=h @topic.subject %></h2>
             <div class="message">
-            <p><span class="author"><%= authoring @message.created_on, @message.author %></span></p>
+            <p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
             <div class="wiki">
-            <%= textilizable(@message.content, :attachments => @message.attachments) %>
+            <%= textilizable(@topic.content, :attachments => @topic.attachments) %>
             </div>
-            <%= link_to_attachments @message.attachments, :no_author => true %>
+            <%= link_to_attachments @topic.attachments, :no_author => true %>
             </div>
             <br />
-            <div class="message reply">
             <h3 class="icon22 icon22-comment"><%= l(:label_reply_plural) %></h3>
-            <% @message.children.each do |message| %>
+            <% @topic.children.each do |message| %>
               <a name="<%= "message-#{message.id}" %>"></a>
+              <div class="contextual">
+                <%= link_to_if_authorized l(:button_edit), {:action => 'edit', :id => message}, :class => 'icon icon-edit' %>
+                <%= link_to_if_authorized l(:button_delete), {:action => 'destroy', :id => message}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del' %>
+              </div>
+              <div class="message reply">
               <h4><%=h message.subject %> - <%= authoring message.created_on, message.author %></h4>
               <div class="wiki"><%= textilizable message.content %></div>
               <%= link_to_attachments message.attachments, :no_author => true %>
+              </div>
             <% end %>
-            </div>
-            <% if authorize_for('messages', 'reply') %>
+            <% if !@topic.locked? && authorize_for('messages', 'reply') %>
             <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
             <div id="reply" style="display:none;">
-            <% form_for :reply, @reply, :url => {:action => 'reply', :id => @message}, :html => {:multipart => true} do |f| %>
+            <% form_for :reply, @reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true} do |f| %>
                 <%= render :partial => 'form', :locals => {:f => f} %>
                 <%= submit_tag l(:button_submit) %>
             <% end %>

lib/redmine.rb +2 0

                 map.permission :manage_boards, {:boards => [:new, :edit, :destroy]}, :require => :member
                 map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
                 map.permission :add_messages, {:messages => [:new, :reply]}
+                map.permission :edit_messages, {:messages => :edit}, :require => :member
+                map.permission :delete_messages, {:messages => :destroy}, :require => :member
               end
             end

public/stylesheets/application.css +5 0

             tr.issue td.subject { text-align: left; }
             tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
+            tr.message { height: 2.6em; }
+            tr.message td.last_message { font-size: 80%; }
+            tr.message.locked td.subject a { background-image: url(../images/locked.png); }
+            tr.message.sticky td.subject a { background-image: url(../images/sticky.png); font-weight: bold; }
             table.list tbody tr:hover { background-color:#ffffdd; }
             table td {padding:2px;}
             table p {margin:0;}

test/fixtures/boards.yml +3 -3

             boards_001:
               name: Help
               project_id: 1
-              topics_count: 1
+              topics_count: 2
               id: 1
               description: Help board
               position: 1
-              last_message_id: 2
+              last_message_id: 5
-              messages_count: 2
+              messages_count: 5
             boards_002:
               name: Discussion
               project_id: 1

test/fixtures/messages.yml +35 -3

@@ -4,8 +4,8 messages_001:
4	updated_on: 2007-05-12 17:15:32 +02:00	4	updated_on: 2007-05-12 17:15:32 +02:00
5	subject: First post	5	subject: First post
6	id: 1	6	id: 1
7	replies_count: 1	7	replies_count: 2
8	last_reply_id: 2	8	last_reply_id: 3
9	content: "This is the very first post\n\	9	content: "This is the very first post\n\
10	in the forum"	10	in the forum"
11	author_id: 1	11	author_id: 1
@@ -22,4 +22,36 messages_002:
22	author_id: 1	22	author_id: 1
23	parent_id: 1	23	parent_id: 1
24	board_id: 1	24	board_id: 1
25	No newline at end of file	25	messages_003:
		26	created_on: 2007-05-12 17:18:02 +02:00
		27	updated_on: 2007-05-12 17:18:02 +02:00
		28	subject: "RE: First post"
		29	id: 3
		30	replies_count: 0
		31	last_reply_id:
		32	content: "An other reply"
		33	author_id:
		34	parent_id: 1
		35	board_id: 1
		36	messages_004:
		37	created_on: 2007-08-12 17:15:32 +02:00
		38	updated_on: 2007-08-12 17:15:32 +02:00
		39	subject: Post 2
		40	id: 4
		41	replies_count: 1
		42	last_reply_id: 5
		43	content: "This is an other post"
		44	author_id:
		45	parent_id:
		46	board_id: 1
		47	messages_005:
		48	created_on: 2007-09-12 17:18:00 +02:00
		49	updated_on: 2007-09-12 17:18:00 +02:00
		50	subject: 'RE: post 2'
		51	id: 5
		52	replies_count: 0
		53	last_reply_id:
		54	content: "Reply to the second post"
		55	author_id: 1
		56	parent_id: 4
		57	board_id: 1

test/unit/message_test.rb +26 0

@@ -41,4 +41,30 class MessageTest < Test::Unit::TestCase
41	assert_equal replies_count+1, @message[:replies_count]	41	assert_equal replies_count+1, @message[:replies_count]
42	assert_equal reply, @message.last_reply	42	assert_equal reply, @message.last_reply
43	end	43	end
		44
		45	def test_destroy_topic
		46	message = Message.find(1)
		47	board = message.board
		48	topics_count, messages_count = board.topics_count, board.messages_count
		49	assert message.destroy
		50	board.reload
		51
		52	# Replies deleted
		53	assert Message.find_all_by_parent_id(1).empty?
		54	# Checks counters
		55	assert_equal topics_count - 1, board.topics_count
		56	assert_equal messages_count - 3, board.messages_count
		57	end
		58
		59	def test_destroy_reply
		60	message = Message.find(5)
		61	board = message.board
		62	topics_count, messages_count = board.topics_count, board.messages_count
		63	assert message.destroy
		64	board.reload
		65
		66	# Checks counters
		67	assert_equal topics_count, board.topics_count
		68	assert_equal messages_count - 1, board.messages_count
		69	end
44	end	70	end

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