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

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class BoardsController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize
               helper :messages
               include MessagesHelper
               helper :sort
               include SortHelper
               helper :watchers
               include WatchersHelper
               def index
                 @boards = @project.boards
                 # show the board if there is only one
                 if @boards.size == 1
                   @board = @boards.first
                   show
                 end
               end
               def show
                 sort_init "#{Message.table_name}.updated_on", "desc"
                 sort_update
                 @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
                 render :action => 'show', :layout => !request.xhr?
               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
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
                 end
               end
               def edit
                 if request.post? && @board.update_attributes(params[:board])
                   case params[:position]
                   when 'highest'; @board.move_to_top
                   when 'higher'; @board.move_higher
                   when 'lower'; @board.move_lower
                   when 'lowest'; @board.move_to_bottom
                   end if params[:position]
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
                 end
               end
               def destroy
                 @board.destroy
                 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
               end
             private
               def find_project
                 @project = Project.find(params[:project_id])
                 @board = @project.boards.find(params[:id]) if params[:id]
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/messages_controller.rb +45 -6

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             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
                   } if params[:attachments] and params[:attachments].is_a? Array
                   redirect_to :action => 'show', :id => @message
                 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
             end

app/helpers/application_helper.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module ApplicationHelper
               include Redmine::WikiFormatting::Macros::Definitions
               def current_role
                 @current_role ||= User.current.role_for_project(@project)
               end
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 User.current.allowed_to?({:controller => controller, :action => action}, @project)
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
               end
               # 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)
                 link_to "#{issue.tracker.name} ##{issue.id}", :controller => "issues", :action => "show", :id => issue
               end
               def toggle_link(name, id, options={})
                 onclick = "Element.toggle('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                 onclick << "return false;"
                 link_to(name, "#", :onclick => onclick)
               end
               def show_and_goto_link(name, id, options={})
                 onclick = "Element.show('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                 onclick << "location.href='##{id}-anchor'; "
                 onclick << "return false;"
                 link_to(name, "#", options.merge(:onclick => onclick))
               end
               def image_to_function(name, function, html_options = {})
                 html_options.symbolize_keys!
                 tag(:input, html_options.merge({
                     :type => "image", :src => image_path(name),
                     :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
                     }))
               end
               def prompt_to_remote(name, text, param, url, html_options = {})
                 html_options[:onclick] = "promptToRemote('#{text}', '#{param}', '#{url_for(url)}'); return false;"
                 link_to name, {}, html_options
               end
               def format_date(date)
                 return nil unless date
                 # "Setting.date_format.size < 2" is a temporary fix (content of date_format setting changed)
                 @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
                 date.strftime(@date_format)
               end
               def format_time(time, include_date = true)
                 return nil unless time
                 time = time.to_time if time.is_a?(String)
                 zone = User.current.time_zone
                 if time.utc?
                   local = zone ? zone.adjust(time) : time.getlocal
                 else
                   local = zone ? zone.adjust(time.getutc) : time
                 end
                 @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
                 @time_format ||= (Setting.time_format.blank? ? l(:general_fmt_time) : Setting.time_format)
                 include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)
               end
               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)
                 l(:general_day_names).split(',')[day-1]
               end
               def month_name(month)
                 l(:actionview_datehelper_select_month_names).split(',')[month-1]
               end
               def pagination_links_full(paginator, options={}, html_options={})
                 page_param = options.delete(:page_param) || :page
                 html = ''
                 html << link_to_remote(('&#171; ' + l(:label_previous)),
                                         {:update => "content", :url => options.merge(page_param => paginator.current.previous)},
                                         {:href => url_for(:params => options.merge(page_param => paginator.current.previous))}) + ' ' if paginator.current.previous
                 html << (pagination_links_each(paginator, options) do |n|
                   link_to_remote(n.to_s,
                                   {:url => {:params => options.merge(page_param => n)}, :update => 'content'},
                                   {:href => url_for(:params => options.merge(page_param => n))})
                 end || '')
                 html << ' ' + link_to_remote((l(:label_next) + ' &#187;'),
                                              {:update => "content", :url => options.merge(page_param => paginator.current.next)},
                                              {:href => url_for(:params => options.merge(page_param => paginator.current.next))}) if paginator.current.next
                 html
               end
               def set_html_title(text)
                 @html_header_title = text
               end
               def html_title
                 title = []
                 title << @project.name if @project
                 title << @html_header_title
                 title << Setting.app_title
                 title.compact.join(' - ')
               end
               ACCESSKEYS = {:edit => 'e',
                             :preview => 'r',
                             :quick_search => 'f',
                             :search => '4',
                             }.freeze unless const_defined?(:ACCESSKEYS)
               def accesskey(s)
                 ACCESSKEYS[s]
               end
               # Formats text according to system settings.
               # 2 ways to call this method:
               # * with a String: textilizable(text, options)
               # * with an object and one of its attribute: textilizable(issue, :description, options)
               def textilizable(*args)
                 options = args.last.is_a?(Hash) ? args.pop : {}
                 case args.size
                 when 1
                   obj = nil
                   text = args.shift || ''
                 when 2
                   obj = args.shift
                   text = obj.send(args.shift)
                 else
                   raise ArgumentError, 'invalid arguments to textilizable'
                 end
                 # when using an image link, try to use an attachment, if possible
                 attachments = options[:attachments]
                 if attachments
                   text = text.gsub(/!([<>=]*)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
                     align = $1
                     filename = $2
                     rf = Regexp.new(filename,  Regexp::IGNORECASE)
                     # search for the picture in attachments
                     if found = attachments.detect { |att| att.filename =~ rf }
                       image_url = url_for :controller => 'attachments', :action => 'download', :id => found.id
                       "!#{align}#{image_url}!"
                     else
                       "!#{align}#{filename}!"
                     end
                   end
                 end
                 text = (Setting.text_formatting == 'textile') ?
                   Redmine::WikiFormatting.to_html(text) { |macro, args| exec_macro(macro, obj, args) } :
                   simple_format(auto_link(h(text)))
                 # different methods for formatting wiki links
                 case options[:wiki_links]
                 when :local
                   # used for local links to html files
                   format_wiki_link = Proc.new {|project, title| "#{title}.html" }
                 when :anchor
                   # used for single-file wiki export
                   format_wiki_link = Proc.new {|project, title| "##{title}" }
                 else
                   format_wiki_link = Proc.new {|project, title| url_for :controller => 'wiki', :action => 'index', :id => project, :page => title }
                 end
                 project = options[:project] || @project
                 # turn wiki links into html links
                 # example:
                 #   [[mypage]]
                 #   [[mypage|mytext]]
                 # wiki links can refer other project wikis, using project name or identifier:
                 #   [[project:]] -> wiki starting page
                 #   [[project:|mytext]]
                 #   [[project:mypage]]
                 #   [[project:mypage|mytext]]
                 text = text.gsub(/\[\[([^\]\|]+)(\|([^\]\|]+))?\]\]/) do |m|
                   link_project = project
                   page = $1
                   title = $3
                   if page =~ /^([^\:]+)\:(.*)$/
                     link_project = Project.find_by_name($1) || Project.find_by_identifier($1)
                     page = title || $2
                     title = $1 if page.blank?
                   end
                   if link_project && link_project.wiki
                     # check if page exists
                     wiki_page = link_project.wiki.find_page(page)
                     link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page)),
                                              :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                   else
                     # project or wiki doesn't exist
                     title || page
                   end
                 end
                 # turn issue and revision ids into links
                 # example:
                 #   #52 -> <a href="/issues/show/52">#52</a>
                 #   r52 -> <a href="/repositories/revision/6?rev=52">r52</a> (project.id is 6)
                 text = text.gsub(%r{([\s\(,-^])(#|r)(\d+)(?=[[:punct:]]|\s|<|$)}) do |m|
                   leading, otype, oid = $1, $2, $3
                   link = nil
                   if otype == 'r'
                     if project && (changeset = project.changesets.find_by_revision(oid))
                       link = link_to("r#{oid}", {:controller => 'repositories', :action => 'revision', :id => project.id, :rev => oid}, :class => 'changeset',
                                                 :title => truncate(changeset.comments, 100))
                     end
                   else
                     if issue = Issue.find_by_id(oid.to_i, :include => [:project, :status], :conditions => Project.visible_by(User.current))
                       link = link_to("##{oid}", {:controller => 'issues', :action => 'show', :id => oid}, :class => 'issue',
                                                 :title => "#{truncate(issue.subject, 100)} (#{issue.status.name})")
                       link = content_tag('del', link) if issue.closed?
                     end
                   end
                   leading + (link || "#{otype}#{oid}")
                 end
                 text
               end
               # Same as Rails' simple_format helper without using paragraphs
               def simple_format_without_paragraph(text)
                 text.to_s.
                   gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
                   gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
                   gsub(/([^\n]\n)(?=[^\n])/, '\1<br />')  # 1 newline   -> br
               end
               def error_messages_for(object_name, options = {})
                 options = options.symbolize_keys
                 object = instance_variable_get("@#{object_name}")
                 if object && !object.errors.empty?
                   # build full_messages here with controller current language
                   full_messages = []
                   object.errors.each do |attr, msg|
                     next if msg.nil?
                     msg = msg.first if msg.is_a? Array
                     if attr == "base"
                       full_messages << l(msg)
                     else
                       full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
                     end
                   end
                   # retrieve custom values error messages
                   if object.errors[:custom_values]
                     object.custom_values.each do |v|
                       v.errors.each do |attr, msg|
                         next if msg.nil?
                         msg = msg.first if msg.is_a? Array
                         full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
                       end
                     end
                   end
                   content_tag("div",
                     content_tag(
                       options[:header_tag] || "span", lwr(:gui_validation_error, full_messages.length) + ":"
                     ) +
                     content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
                     "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
                   )
                 else
                   ""
                 end
               end
               def lang_options_for_select(blank=true)
                 (blank ? [["(auto)", ""]] : []) +
                   GLoc.valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.first <=> y.first }
               end
               def label_tag_for(name, option_tags = nil, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 content_tag("label", label_text)
               end
               def labelled_tabular_form_for(name, object, options, &proc)
                 options[:html] ||= {}
                 options[:html].store :class, "tabular"
                 form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | " +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def progress_bar(pct, options={})
                 width = options[:width] || '100px;'
                 legend = options[:legend] || ''
                 content_tag('table',
                   content_tag('tr',
                     (pct > 0 ? content_tag('td', '', :width => "#{pct.floor}%;", :class => 'closed') : '') +
                     (pct < 100 ? content_tag('td', '', :width => "#{100-pct.floor}%;", :class => 'open') : '')
                   ), :class => 'progress', :style => "width: #{width};") +
                   content_tag('p', legend, :class => 'pourcent')
               end
               def context_menu_link(name, url, options={})
                 options[:class] ||= ''
                 if options.delete(:selected)
                   options[:class] << ' icon-checked disabled'
                   options[:disabled] = true
                 end
                 if options.delete(:disabled)
                   options.delete(:method)
                   options.delete(:confirm)
                   options.delete(:onclick)
                   options[:class] << ' disabled'
                   url = '#'
                 end
                 link_to name, url, options
               end
               def calendar_for(field_id)
                 image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
                 javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
               end
               def wikitoolbar_for(field_id)
                 return '' unless Setting.text_formatting == 'textile'
                 javascript_include_tag('jstoolbar') + javascript_tag("var toolbar = new jsToolBar($('#{field_id}')); toolbar.draw();")
               end
               def content_for(name, content = nil, &block)
                 @has_content ||= {}
                 @has_content[name] = true
                 super(name, content, &block)
               end
               def has_content?(name)
                 (@has_content && @has_content[name]) || false
               end
             end
             class TabularFormBuilder < ActionView::Helpers::FormBuilder
               include GLoc
               def initialize(object_name, object, template, options, proc)
                 set_language_if_valid options.delete(:lang)
                 @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc
               end
               (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|
                 src = <<-END_SRC
                 def #{selector}(field, options = {})
                   return super if options.delete :no_label
                   label_text = l(options[:label]) if options[:label]
                   label_text ||= l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym)
                   label_text << @template.content_tag("span", " *", :class => "required") if options.delete(:required)
                   label = @template.content_tag("label", label_text,
                                 :class => (@object && @object.errors[field] ? "error" : nil),
                                 :for => (@object_name.to_s + "_" + field.to_s))
                   label + super
                 end
                 END_SRC
                 class_eval src, __FILE__, __LINE__
               end
               def select(field, choices, options = {}, html_options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 label = @template.content_tag("label", label_text,
                               :class => (@object && @object.errors[field] ? "error" : nil),
                               :for => (@object_name.to_s + "_" + field.to_s))
                 label + super
               end
             end

app/models/message.rb +18 0

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Message < ActiveRecord::Base
               belongs_to :board
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
               has_many :attachments, :as => :container, :dependent => :destroy
               belongs_to :last_reply, :class_name => 'Message', :foreign_key => 'last_reply_id'
               acts_as_searchable :columns => ['subject', 'content'],
                                  :include => :board,
                                  :project_key => 'project_id',
                                  :date_column => 'created_on'
               acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
                             :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
                 if parent
                   parent.reload.update_attribute(:last_reply_id, self.id)
                 else
                   board.increment! :topics_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
             end

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

             <h2><%= l(:label_board_plural) %></h2>
             <table class="list">
               <thead><tr>
                 <th><%= l(:label_board) %></th>
                 <th><%= l(:label_topic_plural) %></th>
                 <th><%= l(:label_message_plural) %></th>
                 <th><%= l(:label_message_last) %></th>
               </tr></thead>
               <tbody>
             <% for board in @boards %>
               <tr class="<%= cycle 'odd', 'even' %>">
                 <td>
                   <%= link_to h(board.name), {:action => 'show', :id => board}, :class => "icon22 icon22-comment"  %><br />
                   <%=h board.description %>
                 </td>
                 <td align="center"><%= board.topics_count %></td>
                 <td align="center"><%= board.messages_count %></td>
                 <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>
                 </td>
               </tr>
             <% end %>
               </tbody>
             </table>

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

             <div class="contextual">
             <%= link_to_if_authorized l(:label_message_new),
                                       {:controller => 'messages', :action => 'new', :board_id => @board},
                                       :class => 'icon icon-add',
                                       :onclick => 'Element.show("add-message"); return false;' %>
             <%= watcher_tag(@board, User.current) %>
             </div>
             <div id="add-message" style="display:none;">
             <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h2>
             <% form_for :message, @message, :url => {:controller => 'messages', :action => 'new', :board_id => @board}, :html => {:multipart => true} do |f| %>
               <%= render :partial => 'messages/form', :locals => {:f => f} %>
               <p><%= submit_tag l(:button_create) %>
               <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-message")' %></p>
             <% end %>
             </div>
             <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>
                 <%= sort_header_tag("#{Message.table_name}.created_on", :caption => l(:field_created_on)) %>
                 <th><%= l(:label_reply_plural) %></th>
                 <%= sort_header_tag("#{Message.table_name}.updated_on", :caption => l(:label_message_last)) %>
               </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 %>
               </tbody>
             </table>
             <p><%= pagination_links_full @topic_pages %>
             [ <%= @topic_pages.current.first_item %> - <%= @topic_pages.current.last_item %> / <%= @topic_count %> ]</p>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>

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

             <%= error_messages_for 'message' %>
             <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' %>
             <!--[eoform:message]-->
             <span class="tabular">
             <%= render :partial => 'attachments/form' %>
             </span>
             </div>

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 %>
             </div>
             <% end %>

lib/redmine.rb +2 0

             require 'redmine/access_control'
             require 'redmine/menu_manager'
             require 'redmine/mime_type'
             require 'redmine/themes'
             require 'redmine/plugin'
             begin
               require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
             rescue LoadError
               # RMagick is not available
             end
             REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs )
             # Permissions
             Redmine::AccessControl.map do |map|
               map.permission :view_project, {:projects => [:show, :activity]}, :public => true
               map.permission :search_project, {:search => :index}, :public => true
               map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
               map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy]}, :require => :member
               map.permission :manage_versions, {:projects => [:settings, :add_version], :versions => [:edit, :destroy]}, :require => :member
               map.project_module :issue_tracking do |map|
                 # Issue categories
                 map.permission :manage_categories, {:projects => [:settings, :add_issue_category], :issue_categories => [:edit, :destroy]}, :require => :member
                 # Issues
                 map.permission :view_issues, {:projects => [:changelog, :roadmap],
                                               :issues => [:index, :changes, :show, :context_menu],
                                               :queries => :index,
                                               :reports => :issue_report}, :public => true
                 map.permission :add_issues, {:projects => :add_issue}
                 map.permission :edit_issues, {:projects => :bulk_edit_issues,
                                               :issues => [:edit, :destroy_attachment]}
                 map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
                 map.permission :add_issue_notes, {:issues => :add_note}
                 map.permission :change_issue_status, {:issues => :change_status}, :require => :loggedin
                 map.permission :move_issues, {:projects => :move_issues}, :require => :loggedin
                 map.permission :delete_issues, {:issues => :destroy}, :require => :member
                 # Queries
                 map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
                 map.permission :save_queries, {:queries => [:new, :edit, :destroy]}, :require => :loggedin
                 # Gantt & calendar
                 map.permission :view_gantt, :projects => :gantt
                 map.permission :view_calendar, :projects => :calendar
               end
               map.project_module :time_tracking do |map|
                 map.permission :log_time, {:timelog => :edit}, :require => :loggedin
                 map.permission :view_time_entries, :timelog => [:details, :report]
               end
               map.project_module :news do |map|
                 map.permission :manage_news, {:projects => :add_news, :news => [:edit, :destroy, :destroy_comment]}, :require => :member
                 map.permission :view_news, {:news => [:index, :show]}, :public => true
                 map.permission :comment_news, {:news => :add_comment}
               end
               map.project_module :documents do |map|
                 map.permission :manage_documents, {:projects => :add_document, :documents => [:edit, :destroy, :add_attachment, :destroy_attachment]}, :require => :loggedin
                 map.permission :view_documents, :projects => :list_documents, :documents => [:show, :download]
               end
               map.project_module :files do |map|
                 map.permission :manage_files, {:projects => :add_file, :versions => :destroy_file}, :require => :loggedin
                 map.permission :view_files, :projects => :list_files, :versions => :download
               end
               map.project_module :wiki do |map|
                 map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
                 map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
                 map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
                 map.permission :view_wiki_pages, :wiki => [:index, :history, :diff, :special]
                 map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment, :destroy_attachment]
               end
               map.project_module :repository do |map|
                 map.permission :manage_repository, {:repositories => [:edit, :destroy]}, :require => :member
                 map.permission :browse_repository, :repositories => [:show, :browse, :entry, :changes, :diff, :stats, :graph]
                 map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
               end
               map.project_module :boards do |map|
                 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
             # Project menu configuration
             Redmine::MenuManager.map :project_menu do |menu|
               menu.push :label_overview, :controller => 'projects', :action => 'show'
               menu.push :label_activity, :controller => 'projects', :action => 'activity'
               menu.push :label_roadmap, :controller => 'projects', :action => 'roadmap'
               menu.push :label_issue_plural, { :controller => 'issues', :action => 'index' }, :param => :project_id
               menu.push :label_news_plural, { :controller => 'news', :action => 'index' }, :param => :project_id
               menu.push :label_document_plural, :controller => 'projects', :action => 'list_documents'
               menu.push :label_wiki, { :controller => 'wiki', :action => 'index', :page => nil }, :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
               menu.push :label_board_plural, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id, :if => Proc.new { |p| p.boards.any? }
               menu.push :label_attachment_plural, :controller => 'projects', :action => 'list_files'
               menu.push :label_repository, { :controller => 'repositories', :action => 'show' }, :if => Proc.new { |p| p.repository && !p.repository.new_record? }
               menu.push :label_settings, :controller => 'projects', :action => 'settings'
             end

public/stylesheets/application.css +5 0

             body { font-family: Verdana, sans-serif; font-size: 12px; color:#484848; margin: 0; padding: 0; min-width: 900px; }
             h1, h2, h3, h4 { font-family: "Trebuchet MS", Verdana, sans-serif;}
             h1 {margin:0; padding:0; font-size: 24px;}
             h2, .wiki h1 {font-size: 20px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
             h3, .wiki h2 {font-size: 16px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
             h4, .wiki h3 {font-size: 12px;padding: 2px 10px 1px 0px;margin-bottom: 5px; border-bottom: 1px dotted #bbbbbb; color: #444;}
             /***** Layout *****/
             #top-menu {background: #2C4056;color: #fff;height:1.5em; padding: 2px 6px 0px 6px;}
             #top-menu a {color: #fff; padding-right: 4px;}
             #account {float:right;}
             #header {height:5.3em;margin:0;background-color:#507AAA;color:#f8f8f8; padding: 4px 8px 0px 6px; position:relative;}
             #header a {color:#f8f8f8;}
             #quick-search {float:right;}
             #main-menu {position: absolute;  bottom: 0px;  left:6px;}
             #main-menu ul {margin: 0;  padding: 0;}
             #main-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 10px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #main-menu li a {
               display: block;
               color: #fff;
               text-decoration: none;
               margin: 0;
               padding: 4px 4px 4px 4px;
               background: #2C4056;
             }
             #main-menu li a:hover {background:#759FCF;}
             #main {background: url(../images/mainbg.png) repeat-x; background-color:#EEEEEE;}
             #sidebar{ float: right; width: 17%; position: relative; z-index: 9; min-height: 600px; padding: 0; margin: 0;}
             * html #sidebar{ width: 17%; }
             #sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }
             #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
             * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
             #content { width: 80%; background: url(../images/contentbg.png) repeat-x; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; height:600px; min-height: 600px;}
             * html #content{ width: 80%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
             html>body #content {
             height: auto;
             min-height: 600px;
             }
             #main.nosidebar #sidebar{ display: none; }
             #main.nosidebar #content{ width: auto; border-right: 0; }
             #footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;}
             #login-form table {margin-top:5em; padding:1em; margin-left: auto; margin-right: auto; border: 2px solid #FDBF3B; background-color:#FFEBC1; }
             #login-form table td {padding: 6px;}
             #login-form label {font-weight: bold;}
             .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
             /***** Links *****/
             a, a:link, a:visited{ color: #2A5685; text-decoration: none; }
             a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
             a img{ border: 0; }
             /***** Tables *****/
             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 td { overflow: hidden; text-overflow: ellipsis; vertical-align: top;}
             table.list td.id { width: 2%; text-align: center;}
             table.list td.checkbox { width: 15px; padding: 0px;}
             tr.issue { text-align: center; white-space: nowrap; }
             tr.issue td.subject, tr.issue td.category { white-space: normal; }
             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;}
             .odd {background-color:#f6f7f8;}
             .even {background-color: #fff;}
             .highlight { background-color: #FCFD8D;}
             .highlight.token-1 { background-color: #faa;}
             .highlight.token-2 { background-color: #afa;}
             .highlight.token-3 { background-color: #aaf;}
             .box{
             padding:6px;
             margin-bottom: 10px;
             background-color:#f6f6f6;
             color:#505050;
             line-height:1.5em;
             border: 1px solid #e4e4e4;
             }
             div.square {
              border: 1px solid #999;
              float: left;
              margin: .3em .4em 0 .4em;
              overflow: hidden;
              width: .6em; height: .6em;
             }
             .contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px;font-size:0.9em;}
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             form {display: inline;}
             input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
             fieldset {border: 1px solid #e4e4e4; margin:0;}
             legend {color: #484848;}
             hr { width: 100%; height: 1px; background: #ccc; border: 0;}
             textarea.wiki-edit { width: 99%; }
             li p {margin-top: 0;}
             div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
             .autoscroll {overflow-x: auto; padding:1px; width:100%;}
             #user_firstname, #user_lastname, #user_mail, #notification_option { width: 90%; }
             /***** Tabular forms ******/
             .tabular p{
             margin: 0;
             padding: 5px 0 8px 0;
             padding-left: 180px; /*width of left column containing the label elements*/
             height: 1%;
             clear:left;
             }
             .tabular label{
             font-weight: bold;
             float: left;
             text-align: right;
             margin-left: -180px; /*width of left column*/
             width: 175px; /*width of labels. Should be smaller than left column to create some right
             margin*/
             }
             .tabular label.floating{
             font-weight: normal;
             margin-left: 0px;
             text-align: left;
             width: 200px;
             }
             #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
             #settings .tabular p{ padding-left: 300px; }
             #settings .tabular label{ margin-left: -300px; width: 295px; }
             .required {color: #bb0000;}
             .summary {font-style: italic;}
             div.attachments p { margin:4px 0 2px 0; }
             /***** Flash & error messages ****/
             #errorExplanation, div.flash, .nodata {
                 padding: 4px 4px 4px 30px;
                 margin-bottom: 12px;
             	font-size: 1.1em;
             	border: 2px solid;
             }
             div.flash {margin-top: 8px;}
             div.flash.error, #errorExplanation {
                 background: url(../images/false.png) 8px 5px no-repeat;
             	background-color: #ffe3e3;
             	border-color: #dd0000;
             	color: #550000;
             }
             div.flash.notice {
                 background: url(../images/true.png) 8px 5px no-repeat;
             	background-color: #dfffdf;
             	border-color: #9fcf9f;
             	color: #005f00;
             }
             .nodata {
                 text-align: center;
             	background-color: #FFEBC1;
             	border-color: #FDBF3B;
             	color: #A6750C;
             }
             #errorExplanation ul { font-size: 0.9em;}
             /***** Ajax indicator ******/
             #ajax-indicator {
             position: absolute; /* fixed not supported by IE */
             background-color:#eee;
             border: 1px solid #bbb;
             top:35%;
             left:40%;
             width:20%;
             font-weight:bold;
             text-align:center;
             padding:0.6em;
             z-index:100;
             filter:alpha(opacity=50);
             -moz-opacity:0.5;
             opacity: 0.5;
             -khtml-opacity: 0.5;
             }
             html>body #ajax-indicator { position: fixed; }
             #ajax-indicator span {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             background-image: url(../images/loading.gif);
             padding-left: 26px;
             vertical-align: bottom;
             }
             /***** Calendar *****/
             table.cal {border-collapse: collapse; width: 100%; margin: 8px 0 6px 0;border: 1px solid #d7d7d7;}
             table.cal thead th {width: 14%;}
             table.cal tbody tr {height: 100px;}
             table.cal th { background-color:#EEEEEE; padding: 4px; }
             table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em;}
             table.cal td p.day-num {font-size: 1.1em; text-align:right;}
             table.cal td.odd p.day-num {color: #bbb;}
             table.cal td.today {background:#ffffdd;}
             table.cal td.today p.day-num {font-weight: bold;}
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}
             .tooltip:hover{z-index:25;color:#000;}
             .tooltip span.tip{display: none; text-align:left;}
             div.tooltip:hover span.tip{
             display:block;
             position:absolute;
             top:12px; left:24px; width:270px;
             border:1px solid #555;
             background-color:#fff;
             padding: 4px;
             font-size: 0.8em;
             color:#505050;
             }
             /***** Progress bar *****/
             table.progress {
                 border: 1px solid #D7D7D7;
                 border-collapse: collapse;
                 border-spacing: 0pt;
                 empty-cells: show;
                 text-align: center;
                 float:left;
                 margin: 1px 6px 1px 0px;
             }
             table.progress td { height: 0.9em; }
             table.progress td.closed { background: #BAE0BA none repeat scroll 0%; }
             table.progress td.open { background: #FFF none repeat scroll 0%; }
             p.pourcent {font-size: 80%;}
             p.progress-info {clear: left; font-style: italic; font-size: 80%;}
             /***** Tabs *****/
             #content .tabs{height: 2.6em;}
             #content .tabs ul{margin:0;}
             #content .tabs ul li{
             float:left;
             list-style-type:none;
             white-space:nowrap;
             margin-right:8px;
             background:#fff;
             }
             #content .tabs ul li a{
             display:block;
             font-size: 0.9em;
             text-decoration:none;
             line-height:1em;
             padding:4px;
             border: 1px solid #c0c0c0;
             }
             #content .tabs ul li a.selected, #content .tabs ul li a:hover{
             background-color: #507AAA;
             border: 1px solid #507AAA;
             color: #fff;
             text-decoration:none;
             }
             /***** Diff *****/
             .diff_out { background: #fcc; }
             .diff_in { background: #cfc; }
             /***** Wiki *****/
             div.wiki table {
                 border: 1px solid #505050;
                 border-collapse: collapse;
             }
             div.wiki table, div.wiki td, div.wiki th {
                 border: 1px solid #bbb;
                 padding: 4px;
             }
             div.wiki .external {
                 background-position: 0% 60%;
                 background-repeat: no-repeat;
                 padding-left: 12px;
                 background-image: url(../images/external.png);
             }
             div.wiki a.new {
                 color: #b73535;
             }
             div.wiki pre {
                 margin: 1em 1em 1em 1.6em;
                 padding: 2px;
                 background-color: #fafafa;
                 border: 1px solid #dadada;
                 width:95%;
                 overflow-x: auto;
             }
             div.wiki div.toc {
                 background-color: #ffffdd;
                 border: 1px solid #e4e4e4;
                 padding: 4px;
                 line-height: 1.2em;
                 margin-bottom: 12px;
                 margin-right: 12px;
                 display: table
             }
             * html div.wiki div.toc { width: 50%; } /* IE6 doesn't autosize div */
             div.wiki div.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
             div.wiki div.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
             div.wiki div.toc a {
                 display: block;
                 font-size: 0.9em;
                 font-weight: normal;
                 text-decoration: none;
                 color: #606060;
             }
             div.wiki div.toc a:hover { color: #c61a1a; text-decoration: underline;}
             div.wiki div.toc a.heading2 { margin-left: 6px; }
             div.wiki div.toc a.heading3 { margin-left: 12px; font-size: 0.8em; }
             /***** My page layout *****/
             .block-receiver {
             border:1px dashed #c0c0c0;
             margin-bottom: 20px;
             padding: 15px 0 15px 0;
             }
             .mypage-box {
             margin:0 0 20px 0;
             color:#505050;
             line-height:1.5em;
             }
             .handle {
             cursor: move;
             }
             a.close-icon {
             display:block;
             margin-top:3px;
             overflow:hidden;
             width:12px;
             height:12px;
             background-repeat: no-repeat;
             cursor:pointer;
             background-image:url('../images/close.png');
             }
             a.close-icon:hover {
             background-image:url('../images/close_hl.png');
             }
             /***** Gantt chart *****/
             .gantt_hdr {
               position:absolute;
               top:0;
               height:16px;
               border-top: 1px solid #c0c0c0;
               border-bottom: 1px solid #c0c0c0;
               border-right: 1px solid #c0c0c0;
               text-align: center;
               overflow: hidden;
             }
             .task {
               position: absolute;
               height:8px;
               font-size:0.8em;
               color:#888;
               padding:0;
               margin:0;
               line-height:0.8em;
             }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#66f url(../images/task_done.png); border: 1px solid #66f; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
             .milestone { background-image:url(../images/milestone.png); background-repeat: no-repeat; border: 0; }
             /***** Icons *****/
             .icon {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 20px;
             padding-top: 2px;
             padding-bottom: 3px;
             }
             .icon22 {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 26px;
             line-height: 22px;
             vertical-align: middle;
             }
             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.png); }
             .icon-copy { background-image: url(../images/copy.png); }
             .icon-del { background-image: url(../images/delete.png); }
             .icon-move { background-image: url(../images/move.png); }
             .icon-save { background-image: url(../images/save.png); }
             .icon-cancel { background-image: url(../images/cancel.png); }
             .icon-pdf { background-image: url(../images/pdf.png); }
             .icon-csv { background-image: url(../images/csv.png); }
             .icon-html { background-image: url(../images/html.png); }
             .icon-image { background-image: url(../images/image.png); }
             .icon-txt { background-image: url(../images/txt.png); }
             .icon-file { background-image: url(../images/file.png); }
             .icon-folder { background-image: url(../images/folder.png); }
             .open .icon-folder { background-image: url(../images/folder_open.png); }
             .icon-package { background-image: url(../images/package.png); }
             .icon-home { background-image: url(../images/home.png); }
             .icon-user { background-image: url(../images/user.png); }
             .icon-mypage { background-image: url(../images/user_page.png); }
             .icon-admin { background-image: url(../images/admin.png); }
             .icon-projects { background-image: url(../images/projects.png); }
             .icon-logout { background-image: url(../images/logout.png); }
             .icon-help { background-image: url(../images/help.png); }
             .icon-attachment  { background-image: url(../images/attachment.png); }
             .icon-index  { background-image: url(../images/index.png); }
             .icon-history  { background-image: url(../images/history.png); }
             .icon-feed  { background-image: url(../images/feed.png); }
             .icon-time  { background-image: url(../images/time.png); }
             .icon-stats  { background-image: url(../images/stats.png); }
             .icon-warning  { background-image: url(../images/warning.png); }
             .icon-fav  { background-image: url(../images/fav.png); }
             .icon-fav-off  { background-image: url(../images/fav_off.png); }
             .icon-reload  { background-image: url(../images/reload.png); }
             .icon-lock  { background-image: url(../images/locked.png); }
             .icon-unlock  { background-image: url(../images/unlock.png); }
             .icon-note  { background-image: url(../images/note.png); }
             .icon-checked  { background-image: url(../images/true.png); }
             .icon22-projects { background-image: url(../images/22x22/projects.png); }
             .icon22-users { background-image: url(../images/22x22/users.png); }
             .icon22-tracker { background-image: url(../images/22x22/tracker.png); }
             .icon22-role { background-image: url(../images/22x22/role.png); }
             .icon22-workflow { background-image: url(../images/22x22/workflow.png); }
             .icon22-options { background-image: url(../images/22x22/options.png); }
             .icon22-notifications { background-image: url(../images/22x22/notifications.png); }
             .icon22-authent { background-image: url(../images/22x22/authent.png); }
             .icon22-info { background-image: url(../images/22x22/info.png); }
             .icon22-comment { background-image: url(../images/22x22/comment.png); }
             .icon22-package { background-image: url(../images/22x22/package.png); }
             .icon22-settings { background-image: url(../images/22x22/settings.png); }
             .icon22-plugin { background-image: url(../images/22x22/plugin.png); }
             /***** Media print specific styles *****/
             @media print {
               #top-menu, #header, #main-menu, #sidebar, #footer, .contextual { display:none; }
               #main { background: #fff; }
               #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; }
             }

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
               topics_count: 0
               id: 2
               description: Discussion board
               position: 2
               last_message_id:
               messages_count: 0

test/fixtures/messages.yml +35 -3

@@ -1,25 +1,57
1	---	1	---
2	messages_001:	2	messages_001:
3	created_on: 2007-05-12 17:15:32 +02:00	3	created_on: 2007-05-12 17:15:32 +02:00
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
12	parent_id:	12	parent_id:
13	board_id: 1	13	board_id: 1
14	messages_002:	14	messages_002:
15	created_on: 2007-05-12 17:18:00 +02:00	15	created_on: 2007-05-12 17:18:00 +02:00
16	updated_on: 2007-05-12 17:18:00 +02:00	16	updated_on: 2007-05-12 17:18:00 +02:00
17	subject: First reply	17	subject: First reply
18	id: 2	18	id: 2
19	replies_count: 0	19	replies_count: 0
20	last_reply_id:	20	last_reply_id:
21	content: "Reply to the first post"	21	content: "Reply to the first post"
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

             require File.dirname(__FILE__) + '/../test_helper'
             class MessageTest < Test::Unit::TestCase
               fixtures :projects, :boards, :messages
               def setup
                 @board = Board.find(1)
                 @user = User.find(1)
               end
               def test_create
                 topics_count = @board.topics_count
                 messages_count = @board.messages_count
                 message = Message.new(:board => @board, :subject => 'Test message', :content => 'Test message content', :author => @user)
                 assert message.save
                 @board.reload
                 # topics count incremented
                 assert_equal topics_count+1, @board[:topics_count]
                 # messages count incremented
                 assert_equal messages_count+1, @board[:messages_count]
                 assert_equal message, @board.last_message
               end
               def test_reply
                 topics_count = @board.topics_count
                 messages_count = @board.messages_count
                 @message = Message.find(1)
                 replies_count = @message.replies_count
                 reply = Message.new(:board => @board, :subject => 'Test reply', :content => 'Test reply content', :parent => @message, :author => @user)
                 assert reply.save
                 @board.reload
                 # same topics count
                 assert_equal topics_count, @board[:topics_count]
                 # messages count incremented
                 assert_equal messages_count+1, @board[:messages_count]
                 assert_equal reply, @board.last_message
                 @message.reload
                 # replies count incremented
                 assert_equal replies_count+1, @message[:replies_count]
                 assert_equal reply, @message.last_reply
               end
+              def test_destroy_topic
+                message = Message.find(1)
+                board = message.board
+                topics_count, messages_count = board.topics_count, board.messages_count
+                assert message.destroy
+                board.reload
+                # Replies deleted
+                assert Message.find_all_by_parent_id(1).empty?
+                # Checks counters
+                assert_equal topics_count - 1, board.topics_count
+                assert_equal messages_count - 3, board.messages_count
+              end
+              def test_destroy_reply
+                message = Message.find(5)
+                board = message.board
+                topics_count, messages_count = board.topics_count, board.messages_count
+                assert message.destroy
+                board.reload
+                # Checks counters
+                assert_equal topics_count, board.topics_count
+                assert_equal messages_count - 1, board.messages_count
+              end
             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