jro_apps/redmine Commit - r2170:733987fbb6e4

Merged r2168 to r2171 from trunk....

Jean-Philippe Lang -

r2170:733987fbb6e4

parent child

Context file:

r2170:733987fbb6e4

Collapse all files

app/controllers/admin_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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 AdminController < ApplicationController
               before_filter :require_admin
               helper :sort
               include SortHelper
               def index
                 @no_configuration_data = Redmine::DefaultData::Loader::no_data?
               end
               def projects
                 sort_init 'name', 'asc'
-                sort_update
+                sort_update %w(name is_public created_on)
                 @status = params[:status] ? params[:status].to_i : 1
                 c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
                 unless params[:name].blank?
                   name = "%#{params[:name].strip.downcase}%"
                   c << ["LOWER(identifier) LIKE ? OR LOWER(name) LIKE ?", name, name]
                 end
                 @project_count = Project.count(:conditions => c.conditions)
                 @project_pages = Paginator.new self, @project_count,
             								per_page_option,
             								params['page']
                 @projects = Project.find :all, :order => sort_clause,
                                     :conditions => c.conditions,
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
                 render :action => "projects", :layout => false if request.xhr?
               end
               def plugins
                 @plugins = Redmine::Plugin.all
               end
               # Loads the default configuration
               # (roles, trackers, statuses, workflow, enumerations)
               def default_configuration
                 if request.post?
                   begin
                     Redmine::DefaultData::Loader::load(params[:lang])
                     flash[:notice] = l(:notice_default_data_loaded)
                   rescue Exception => e
                     flash[:error] = l(:error_can_t_load_default_data, e.message)
                   end
                 end
                 redirect_to :action => 'index'
               end
               def test_email
                 raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
                 # Force ActionMailer to raise delivery errors so we can catch it
                 ActionMailer::Base.raise_delivery_errors = true
                 begin
                   @test = Mailer.deliver_test(User.current)
                   flash[:notice] = l(:notice_email_sent, User.current.mail)
                 rescue Exception => e
                   flash[:error] = l(:notice_email_error, e.message)
                 end
                 ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
                 redirect_to :controller => 'settings', :action => 'edit', :tab => 'notifications'
               end
               def info
                 @db_adapter_name = ActiveRecord::Base.connection.adapter_name
                 @flags = {
                   :default_admin_changed => User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?,
                   :file_repository_writable => File.writable?(Attachment.storage_path),
                   :rmagick_available => Object.const_defined?(:Magick)
                 }
               end
             end

app/controllers/boards_controller.rb +4 -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.
             class BoardsController < ApplicationController
               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_init 'updated_on', 'desc'
-                sort_update
+                sort_update	'created_on' => "#{Message.table_name}.created_on",
+                            'replies' => "#{Message.table_name}.replies_count",
+                            'updated_on' => "#{Message.table_name}.updated_on"
                 @topic_count = @board.topics.count
                 @topic_pages = Paginator.new self, @topic_count, per_page_option, params['page']
                 @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/issues_controller.rb +6 -4

             # Redmine - project management software
             # Copyright (C) 2006-2008  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 IssuesController < ApplicationController
               menu_item :new_issue, :only => :new
               before_filter :find_issue, :only => [:show, :edit, :reply, :destroy_attachment]
               before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
               before_filter :find_project, :only => [:new, :update_form, :preview]
               before_filter :authorize, :except => [:index, :changes, :gantt, :calendar, :preview, :update_form, :context_menu]
               before_filter :find_optional_project, :only => [:index, :changes, :gantt, :calendar]
               accept_key_auth :index, :changes
               helper :journals
               helper :projects
               include ProjectsHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper :issue_relations
               include IssueRelationsHelper
               helper :watchers
               include WatchersHelper
               helper :attachments
               include AttachmentsHelper
               helper :queries
               helper :sort
               include SortHelper
               include IssuesHelper
               helper :timelog
               def index
-                sort_init "#{Issue.table_name}.id", "desc"
-                sort_update
                 retrieve_query
+                sort_init 'id', 'desc'
+                sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
                 if @query.valid?
                   limit = per_page_option
                   respond_to do |format|
                     format.html { }
                     format.atom { }
                     format.csv  { limit = Setting.issues_export_limit.to_i }
                     format.pdf  { limit = Setting.issues_export_limit.to_i }
                   end
                   @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
                   @issue_pages = Paginator.new self, @issue_count, limit, params['page']
                   @issues = Issue.find :all, :order => sort_clause,
                                        :include => [ :assigned_to, :status, :tracker, :project, :priority, :category, :fixed_version ],
                                        :conditions => @query.statement,
                                        :limit  =>  limit,
                                        :offset =>  @issue_pages.current.offset
                   respond_to do |format|
                     format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
                     format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
                     format.csv  { send_data(issues_to_csv(@issues, @project).read, :type => 'text/csv; header=present', :filename => 'export.csv') }
                     format.pdf  { send_data(render(:template => 'issues/index.rfpdf', :layout => false), :type => 'application/pdf', :filename => 'export.pdf') }
                   end
                 else
                   # Send html if the query is not valid
                   render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def changes
-                sort_init "#{Issue.table_name}.id", "desc"
-                sort_update
                 retrieve_query
+                sort_init 'id', 'desc'
+                sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
                 if @query.valid?
                   @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ],
                                                  :conditions => @query.statement,
                                                  :limit => 25,
                                                  :order => "#{Journal.table_name}.created_on DESC"
                 end
                 @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
                 render :layout => false, :content_type => 'application/atom+xml'
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def show
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
                 @journals.each_with_index {|j,i| j.indice = i+1}
                 @journals.reverse! if User.current.wants_comments_in_reverse_order?
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @priorities = Enumeration::get_values('IPRI')
                 @time_entry = TimeEntry.new
                 respond_to do |format|
                   format.html { render :template => 'issues/show.rhtml' }
                   format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' }
                   format.pdf  { send_data(render(:template => 'issues/show.rfpdf', :layout => false), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
                 end
               end
               # Add a new issue
               # The new issue will be created from an existing one if copy_from parameter is given
               def new
                 @issue = Issue.new
                 @issue.copy_from(params[:copy_from]) if params[:copy_from]
                 @issue.project = @project
                 # Tracker must be set before custom field values
                 @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
                 if @issue.tracker.nil?
                   flash.now[:error] = 'No tracker is associated to this project. Please check the Project settings.'
                   render :nothing => true, :layout => true
                   return
                 end
                 @issue.attributes = params[:issue]
                 @issue.author = User.current
                 default_status = IssueStatus.default
                 unless default_status
                   flash.now[:error] = 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
                   render :nothing => true, :layout => true
                   return
                 end
                 @issue.status = default_status
                 @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)).uniq
                 if request.get? || request.xhr?
                   @issue.start_date ||= Date.today
                 else
                   requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
                   # Check that the user is allowed to apply the requested status
                   @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
                   if @issue.save
                     attach_files(@issue, params[:attachments])
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
                     redirect_to :controller => 'issues', :action => 'show', :id => @issue
                     return
                   end
                 end
                 @priorities = Enumeration::get_values('IPRI')
                 render :layout => !request.xhr?
               end
               # Attributes that can be updated on workflow transition (without :edit permission)
               # TODO: make it configurable (at least per role)
               UPDATABLE_ATTRS_ON_TRANSITION = %w(status_id assigned_to_id fixed_version_id done_ratio) unless const_defined?(:UPDATABLE_ATTRS_ON_TRANSITION)
               def edit
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @priorities = Enumeration::get_values('IPRI')
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @time_entry = TimeEntry.new
                 @notes = params[:notes]
                 journal = @issue.init_journal(User.current, @notes)
                 # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
                 if (@edit_allowed || !@allowed_statuses.empty?) && params[:issue]
                   attrs = params[:issue].dup
                   attrs.delete_if {|k,v| !UPDATABLE_ATTRS_ON_TRANSITION.include?(k) } unless @edit_allowed
                   attrs.delete(:status_id) unless @allowed_statuses.detect {|s| s.id.to_s == attrs[:status_id].to_s}
                   @issue.attributes = attrs
                 end
                 if request.post?
                   @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
                   @time_entry.attributes = params[:time_entry]
                   attachments = attach_files(@issue, params[:attachments])
                   attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
                   call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal})
                   if (@time_entry.hours.nil? || @time_entry.valid?) && @issue.save
                     # Log spend time
                     if current_role.allowed_to?(:log_time)
                       @time_entry.save
                     end
                     if !journal.new_record?
                       # Only send notification if something was actually changed
                       flash[:notice] = l(:notice_successful_update)
                       Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
                     end
                     redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
                   end
                 end
               rescue ActiveRecord::StaleObjectError
                 # Optimistic locking exception
                 flash.now[:error] = l(:notice_locking_conflict)
               end
               def reply
                 journal = Journal.find(params[:journal_id]) if params[:journal_id]
                 if journal
                   user = journal.user
                   text = journal.notes
                 else
                   user = @issue.author
                   text = @issue.description
                 end
                 content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
                 content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
                 render(:update) { |page|
                   page.<< "$('notes').value = \"#{content}\";"
                   page.show 'update'
                   page << "Form.Element.focus('notes');"
                   page << "Element.scrollTo('update');"
                   page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;"
                 }
               end
               # Bulk edit a set of issues
               def bulk_edit
                 if request.post?
                   status = params[:status_id].blank? ? nil : IssueStatus.find_by_id(params[:status_id])
                   priority = params[:priority_id].blank? ? nil : Enumeration.find_by_id(params[:priority_id])
                   assigned_to = (params[:assigned_to_id].blank? || params[:assigned_to_id] == 'none') ? nil : User.find_by_id(params[:assigned_to_id])
                   category = (params[:category_id].blank? || params[:category_id] == 'none') ? nil : @project.issue_categories.find_by_id(params[:category_id])
                   fixed_version = (params[:fixed_version_id].blank? || params[:fixed_version_id] == 'none') ? nil : @project.versions.find_by_id(params[:fixed_version_id])
                   unsaved_issue_ids = []
                   @issues.each do |issue|
                     journal = issue.init_journal(User.current, params[:notes])
                     issue.priority = priority if priority
                     issue.assigned_to = assigned_to if assigned_to || params[:assigned_to_id] == 'none'
                     issue.category = category if category || params[:category_id] == 'none'
                     issue.fixed_version = fixed_version if fixed_version || params[:fixed_version_id] == 'none'
                     issue.start_date = params[:start_date] unless params[:start_date].blank?
                     issue.due_date = params[:due_date] unless params[:due_date].blank?
                     issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?
                     call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
                     # Don't save any change to the issue if the user is not authorized to apply the requested status
                     if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save
                       # Send notification for each issue (if changed)
                       Mailer.deliver_issue_edit(journal) if journal.details.any? && Setting.notified_events.include?('issue_updated')
                     else
                       # Keep unsaved issue ids to display them in flash error
                       unsaved_issue_ids << issue.id
                     end
                   end
                   if unsaved_issue_ids.empty?
                     flash[:notice] = l(:notice_successful_update) unless @issues.empty?
                   else
                     flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
                   end
                   redirect_to(params[:back_to] || {:controller => 'issues', :action => 'index', :project_id => @project})
                   return
                 end
                 # Find potential statuses the user could be allowed to switch issues to
                 @available_statuses = Workflow.find(:all, :include => :new_status,
                                                           :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq.sort
               end
               def move
                 @allowed_projects = []
                 # find projects to which the user is allowed to move the issue
                 if User.current.admin?
                   # admin is allowed to move issues to any active (visible) project
                   @allowed_projects = Project.find(:all, :conditions => Project.visible_by(User.current), :order => 'name')
                 else
                   User.current.memberships.each {|m| @allowed_projects << m.project if m.role.allowed_to?(:move_issues)}
                 end
                 @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
                 @target_project ||= @project
                 @trackers = @target_project.trackers
                 if request.post?
                   new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
                   unsaved_issue_ids = []
                   @issues.each do |issue|
                     issue.init_journal(User.current)
                     unsaved_issue_ids << issue.id unless issue.move_to(@target_project, new_tracker)
                   end
                   if unsaved_issue_ids.empty?
                     flash[:notice] = l(:notice_successful_update) unless @issues.empty?
                   else
                     flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
                   end
                   redirect_to :controller => 'issues', :action => 'index', :project_id => @project
                   return
                 end
                 render :layout => false if request.xhr?
               end
               def destroy
                 @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
                 if @hours > 0
                   case params[:todo]
                   when 'destroy'
                     # nothing to do
                   when 'nullify'
                     TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
                   when 'reassign'
                     reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
                     if reassign_to.nil?
                       flash.now[:error] = l(:error_issue_not_found_in_project)
                       return
                     else
                       TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
                     end
                   else
                     # display the destroy form
                     return
                   end
                 end
                 @issues.each(&:destroy)
                 redirect_to :action => 'index', :project_id => @project
               end
               def destroy_attachment
                 a = @issue.attachments.find(params[:attachment_id])
                 a.destroy
                 journal = @issue.init_journal(User.current)
                 journal.details << JournalDetail.new(:property => 'attachment',
                                                      :prop_key => a.id,
                                                      :old_value => a.filename)
                 journal.save
                 redirect_to :action => 'show', :id => @issue
               end
               def gantt
                 @gantt = Redmine::Helpers::Gantt.new(params)
                 retrieve_query
                 if @query.valid?
                   events = []
                   # Issues that have start and due dates
                   events += Issue.find(:all,
                                        :order => "start_date, due_date",
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["(#{@query.statement}) AND (((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
                                        )
                   # Issues that don't have a due date but that are assigned to a version with a date
                   events += Issue.find(:all,
                                        :order => "start_date, effective_date",
                                        :include => [:tracker, :status, :assigned_to, :priority, :project, :fixed_version],
                                        :conditions => ["(#{@query.statement}) AND (((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
                                        )
                   # Versions
                   events += Version.find(:all, :include => :project,
                                                :conditions => ["(#{@query.project_statement}) AND effective_date BETWEEN ? AND ?", @gantt.date_from, @gantt.date_to])
                   @gantt.events = events
                 end
                 respond_to do |format|
                   format.html { render :template => "issues/gantt.rhtml", :layout => !request.xhr? }
                   format.png  { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{@project.identifier}-gantt.png") } if @gantt.respond_to?('to_image')
                   format.pdf  { send_data(render(:template => "issues/gantt.rfpdf", :layout => false), :type => 'application/pdf', :filename => "#{@project.nil? ? '' : "#{@project.identifier}-" }gantt.pdf") }
                 end
               end
               def calendar
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
                 retrieve_query
                 if @query.valid?
                   events = []
                   events += Issue.find(:all,
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["(#{@query.statement}) AND ((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
                                        )
                   events += Version.find(:all, :include => :project,
                                                :conditions => ["(#{@query.project_statement}) AND effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
                   @calendar.events = events
                 end
                 render :layout => false if request.xhr?
               end
               def context_menu
                 @issues = Issue.find_all_by_id(params[:ids], :include => :project)
                 if (@issues.size == 1)
                   @issue = @issues.first
                   @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 end
                 projects = @issues.collect(&:project).compact.uniq
                 @project = projects.first if projects.size == 1
                 @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
                         :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
                         :update => (@project && (User.current.allowed_to?(:edit_issues, @project) || (User.current.allowed_to?(:change_status, @project) && @allowed_statuses && !@allowed_statuses.empty?))),
                         :move => (@project && User.current.allowed_to?(:move_issues, @project)),
                         :copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
                         :delete => (@project && User.current.allowed_to?(:delete_issues, @project))
                         }
                 if @project
                   @assignables = @project.assignable_users
                   @assignables << @issue.assigned_to if @issue && @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
                 end
                 @priorities = Enumeration.get_values('IPRI').reverse
                 @statuses = IssueStatus.find(:all, :order => 'position')
                 @back = request.env['HTTP_REFERER']
                 render :layout => false
               end
               def update_form
                 @issue = Issue.new(params[:issue])
                 render :action => :new, :layout => false
               end
               def preview
                 @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
                 @attachements = @issue.attachments if @issue
                 @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
                 render :partial => 'common/preview'
               end
             private
               def find_issue
                 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                 @project = @issue.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Filter for bulk operations
               def find_issues
                 @issues = Issue.find_all_by_id(params[:id] || params[:ids])
                 raise ActiveRecord::RecordNotFound if @issues.empty?
                 projects = @issues.collect(&:project).compact.uniq
                 if projects.size == 1
                   @project = projects.first
                 else
                   # TODO: let users bulk edit/move/destroy issues from different projects
                   render_error 'Can not bulk edit/move/destroy issues from different projects' and return false
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_project
                 @project = Project.find(params[:project_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 @project = Project.find(params[:project_id]) unless params[:project_id].blank?
                 allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
                 allowed ? true : deny_access
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Retrieve query from session or build a new query
               def retrieve_query
                 if !params[:query_id].blank?
                   cond = "project_id IS NULL"
                   cond << " OR project_id = #{@project.id}" if @project
                   @query = Query.find(params[:query_id], :conditions => cond)
                   @query.project = @project
                   session[:query] = {:id => @query.id, :project_id => @query.project_id}
                 else
                   if params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
                     # Give it a name, required to be valid
                     @query = Query.new(:name => "_")
                     @query.project = @project
                     if params[:fields] and params[:fields].is_a? Array
                       params[:fields].each do |field|
                         @query.add_filter(field, params[:operators][field], params[:values][field])
                       end
                     else
                       @query.available_filters.keys.each do |field|
                         @query.add_short_filter(field, params[field]) if params[field]
                       end
                     end
                     session[:query] = {:project_id => @query.project_id, :filters => @query.filters}
                   else
                     @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
                     @query ||= Query.new(:name => "_", :project => @project, :filters => session[:query][:filters])
                     @query.project = @project
                   end
                 end
               end
             end

app/controllers/projects_controller.rb +6 -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.
             class ProjectsController < ApplicationController
               menu_item :overview
               menu_item :activity, :only => :activity
               menu_item :roadmap, :only => :roadmap
               menu_item :files, :only => [:list_files, :add_file]
               menu_item :settings, :only => :settings
               menu_item :issues, :only => [:changelog]
               before_filter :find_project, :except => [ :index, :list, :add, :activity ]
               before_filter :find_optional_project, :only => :activity
               before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy, :activity ]
               before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
               accept_key_auth :activity
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper :issues
               helper IssuesHelper
               helper :queries
               include QueriesHelper
               helper :repositories
               include RepositoriesHelper
               include ProjectsHelper
               # Lists visible projects
               def index
                 projects = Project.find :all,
                                         :conditions => Project.visible_by(User.current),
                                         :include => :parent
                 respond_to do |format|
                   format.html {
                     @project_tree = projects.group_by {|p| p.parent || p}
                     @project_tree.keys.each {|p| @project_tree[p] -= [p]}
                   }
                   format.atom {
                     render_feed(projects.sort_by(&:created_on).reverse.slice(0, Setting.feeds_limit.to_i),
                                               :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
                   }
                 end
               end
               # Add a new project
               def add
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
                 @root_projects = Project.find(:all,
                                               :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
                                               :order => 'name')
                 @project = Project.new(params[:project])
                 if request.get?
                   @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
                   @project.trackers = Tracker.all
                   @project.is_public = Setting.default_projects_public?
                   @project.enabled_module_names = Redmine::AccessControl.available_project_modules
                 else
                   @project.enabled_module_names = params[:enabled_modules]
                   if @project.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
               # Show @project
               def show
                 @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
                 @subprojects = @project.children.find(:all, :conditions => Project.visible_by(User.current))
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = @project.rolled_up_trackers
                 cond = @project.project_condition(Setting.display_subprojects_issues?)
                 Issue.visible_by(User.current) do
                   @open_issues_by_tracker = Issue.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
                   @total_issues_by_tracker = Issue.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => cond)
                 end
                 TimeEntry.visible_by(User.current) do
                   @total_hours = TimeEntry.sum(:hours,
                                                :include => :project,
                                                :conditions => cond).to_f
                 end
                 @key = User.current.rss_key
               end
               def settings
                 @root_projects = Project.find(:all,
                                               :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id],
                                               :order => 'name')
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @trackers = Tracker.all
                 @repository ||= @project.repository
                 @wiki ||= @project.wiki
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.attributes = params[:project]
                   if @project.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               def modules
                 @project.enabled_module_names = params[:enabled_modules]
                 redirect_to :action => 'settings', :id => @project, :tab => 'modules'
               end
               def archive
                 @project.archive if request.post? && @project.active?
                 redirect_to :controller => 'admin', :action => 'projects'
               end
               def unarchive
                 @project.unarchive if request.post? && !@project.active?
                 redirect_to :controller => 'admin', :action => 'projects'
               end
               # Delete @project
               def destroy
                 @project_to_destroy = @project
                 if request.post? and params[:confirm]
                   @project_to_destroy.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
                 # hide project in layout
                 @project = nil
               end
               # Add a new issue category to @project
               def add_issue_category
                 @category = @project.issue_categories.build(params[:category])
                 if request.post? and @category.save
               	  respond_to do |format|
                     format.html do
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to :action => 'settings', :tab => 'categories', :id => @project
                     end
                     format.js do
                       # IE doesn't support the replace_html rjs method for select box options
                       render(:update) {|page| page.replace "issue_category_id",
                         content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
                       }
                     end
                   end
                 end
               end
               # Add a new version to @project
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
               	  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'settings', :tab => 'versions', :id => @project
               	end
               end
               def add_file
                 if request.post?
                   @version = @project.versions.find_by_id(params[:version_id])
                   attachments = attach_files(@version, params[:attachments])
                   Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('file_added')
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                 end
                 @versions = @project.versions.sort
               end
               def list_files
-                sort_init "#{Attachment.table_name}.filename", "asc"
+                sort_init 'filename', 'asc'
-                sort_update
+                sort_update 'filename' => "#{Attachment.table_name}.filename",
+                            'created_on' => "#{Attachment.table_name}.created_on",
+                            'size' => "#{Attachment.table_name}.filesize",
+                            'downloads' => "#{Attachment.table_name}.downloads"
                 @versions = @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
                 render :layout => !request.xhr?
               end
               # Show changelog for @project
               def changelog
                 @trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
               end
               def roadmap
                 @trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
                 @versions = @versions.select {|v| !v.completed? } unless params[:completed]
               end
               def activity
                 @days = Setting.activity_days_default.to_i
                 if params[:from]
                   begin; @date_to = params[:from].to_date + 1; rescue; end
                 end
                 @date_to ||= Date.today + 1
                 @date_from = @date_to - @days
                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
                 @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
                                                                          :with_subprojects => @with_subprojects,
                                                                          :author => @author)
                 @activity.scope_select {|t| !params["show_#{t}"].nil?}
                 @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
                 events = @activity.events(@date_from, @date_to)
                 respond_to do |format|
                   format.html {
                     @events_by_day = events.group_by(&:event_date)
                     render :layout => false if request.xhr?
                   }
                   format.atom {
                     title = l(:label_activity)
                     if @author
                       title = @author.name
                     elsif @activity.scope.size == 1
                       title = l("label_#{@activity.scope.first.singularize}_plural")
                     end
                     render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
                   }
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # Used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 return true unless params[:id]
                 @project = Project.find(params[:id])
                 authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def retrieve_selected_tracker_ids(selectable_trackers)
                 if ids = params[:tracker_ids]
                   @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                 else
                   @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
                 end
               end
             end

app/controllers/timelog_controller.rb +6 -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 TimelogController < ApplicationController
               menu_item :issues
               before_filter :find_project, :authorize, :only => [:edit, :destroy]
               before_filter :find_optional_project, :only => [:report, :details]
               verify :method => :post, :only => :destroy, :redirect_to => { :action => :details }
               helper :sort
               include SortHelper
               helper :issues
               include TimelogHelper
               helper :custom_fields
               include CustomFieldsHelper
               def report
                 @available_criterias = { 'project' => {:sql => "#{TimeEntry.table_name}.project_id",
                                                       :klass => Project,
                                                       :label => :label_project},
                                          'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
                                                       :klass => Version,
                                                       :label => :label_version},
                                          'category' => {:sql => "#{Issue.table_name}.category_id",
                                                         :klass => IssueCategory,
                                                         :label => :field_category},
                                          'member' => {:sql => "#{TimeEntry.table_name}.user_id",
                                                      :klass => User,
                                                      :label => :label_member},
                                          'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
                                                       :klass => Tracker,
                                                       :label => :label_tracker},
                                          'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
                                                        :klass => Enumeration,
                                                        :label => :label_activity},
                                          'issue' => {:sql => "#{TimeEntry.table_name}.issue_id",
                                                      :klass => Issue,
                                                      :label => :label_issue}
                                        }
                 # Add list and boolean custom fields as available criterias
                 custom_fields = (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields)
                 custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
                   @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = #{Issue.table_name}.id)",
                                                          :format => cf.field_format,
                                                          :label => cf.name}
                 end if @project
                 # Add list and boolean time entry custom fields
                 TimeEntryCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
                   @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'TimeEntry' AND c.customized_id = #{TimeEntry.table_name}.id)",
                                                          :format => cf.field_format,
                                                          :label => cf.name}
                 end
                 @criterias = params[:criterias] || []
                 @criterias = @criterias.select{|criteria| @available_criterias.has_key? criteria}
                 @criterias.uniq!
                 @criterias = @criterias[0,3]
                 @columns = (params[:columns] && %w(year month week day).include?(params[:columns])) ? params[:columns] : 'month'
                 retrieve_date_range
                 unless @criterias.empty?
                   sql_select = @criterias.collect{|criteria| @available_criterias[criteria][:sql] + " AS " + criteria}.join(', ')
                   sql_group_by = @criterias.collect{|criteria| @available_criterias[criteria][:sql]}.join(', ')
                   sql = "SELECT #{sql_select}, tyear, tmonth, tweek, spent_on, SUM(hours) AS hours"
                   sql << " FROM #{TimeEntry.table_name}"
                   sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
                   sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
                   sql << " WHERE"
                   sql << " (%s) AND" % @project.project_condition(Setting.display_subprojects_issues?) if @project
                   sql << " (%s) AND" % Project.allowed_to_condition(User.current, :view_time_entries)
                   sql << " (spent_on BETWEEN '%s' AND '%s')" % [ActiveRecord::Base.connection.quoted_date(@from.to_time), ActiveRecord::Base.connection.quoted_date(@to.to_time)]
                   sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek, spent_on"
                   @hours = ActiveRecord::Base.connection.select_all(sql)
                   @hours.each do |row|
                     case @columns
                     when 'year'
                       row['year'] = row['tyear']
                     when 'month'
                       row['month'] = "#{row['tyear']}-#{row['tmonth']}"
                     when 'week'
                       row['week'] = "#{row['tyear']}-#{row['tweek']}"
                     when 'day'
                       row['day'] = "#{row['spent_on']}"
                     end
                   end
                   @total_hours = @hours.inject(0) {|s,k| s = s + k['hours'].to_f}
                   @periods = []
                   # Date#at_beginning_of_ not supported in Rails 1.2.x
                   date_from = @from.to_time
                   # 100 columns max
                   while date_from <= @to.to_time && @periods.length < 100
                     case @columns
                     when 'year'
                       @periods << "#{date_from.year}"
                       date_from = (date_from + 1.year).at_beginning_of_year
                     when 'month'
                       @periods << "#{date_from.year}-#{date_from.month}"
                       date_from = (date_from + 1.month).at_beginning_of_month
                     when 'week'
                       @periods << "#{date_from.year}-#{date_from.to_date.cweek}"
                       date_from = (date_from + 7.day).at_beginning_of_week
                     when 'day'
                       @periods << "#{date_from.to_date}"
                       date_from = date_from + 1.day
                     end
                   end
                 end
                 respond_to do |format|
                   format.html { render :layout => !request.xhr? }
                   format.csv  { send_data(report_to_csv(@criterias, @periods, @hours).read, :type => 'text/csv; header=present', :filename => 'timelog.csv') }
                 end
               end
               def details
                 sort_init 'spent_on', 'desc'
-                sort_update
+                sort_update 'spent_on' => 'spent_on',
+                            'user' => 'user_id',
+                            'activity' => 'activity_id',
+                            'project' => "#{Project.table_name}.name",
+                            'issue' => 'issue_id',
+                            'hours' => 'hours'
                 cond = ARCondition.new
                 if @project.nil?
                   cond << Project.allowed_to_condition(User.current, :view_time_entries)
                 elsif @issue.nil?
                   cond << @project.project_condition(Setting.display_subprojects_issues?)
                 else
                   cond << ["#{TimeEntry.table_name}.issue_id = ?", @issue.id]
                 end
                 retrieve_date_range
                 cond << ['spent_on BETWEEN ? AND ?', @from, @to]
                 TimeEntry.visible_by(User.current) do
                   respond_to do |format|
                     format.html {
                       # Paginate results
                       @entry_count = TimeEntry.count(:include => :project, :conditions => cond.conditions)
                       @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
                       @entries = TimeEntry.find(:all,
                                                 :include => [:project, :activity, :user, {:issue => :tracker}],
                                                 :conditions => cond.conditions,
                                                 :order => sort_clause,
                                                 :limit  =>  @entry_pages.items_per_page,
                                                 :offset =>  @entry_pages.current.offset)
                       @total_hours = TimeEntry.sum(:hours, :include => :project, :conditions => cond.conditions).to_f
                       render :layout => !request.xhr?
                     }
                     format.atom {
                       entries = TimeEntry.find(:all,
                                                :include => [:project, :activity, :user, {:issue => :tracker}],
                                                :conditions => cond.conditions,
                                                :order => "#{TimeEntry.table_name}.created_on DESC",
                                                :limit => Setting.feeds_limit.to_i)
                       render_feed(entries, :title => l(:label_spent_time))
                     }
                     format.csv {
                       # Export all entries
                       @entries = TimeEntry.find(:all,
                                                 :include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
                                                 :conditions => cond.conditions,
                                                 :order => sort_clause)
                       send_data(entries_to_csv(@entries).read, :type => 'text/csv; header=present', :filename => 'timelog.csv')
                     }
                   end
                 end
               end
               def edit
                 render_403 and return if @time_entry && !@time_entry.editable_by?(User.current)
                 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
                 @time_entry.attributes = params[:time_entry]
                 if request.post? and @time_entry.save
                   flash[:notice] = l(:notice_successful_update)
                   redirect_back_or_default :action => 'details', :project_id => @time_entry.project
                   return
                 end
               end
               def destroy
                 render_404 and return unless @time_entry
                 render_403 and return unless @time_entry.editable_by?(User.current)
                 @time_entry.destroy
                 flash[:notice] = l(:notice_successful_delete)
                 redirect_to :back
               rescue ::ActionController::RedirectBackError
                 redirect_to :action => 'details', :project_id => @time_entry.project
               end
             private
               def find_project
                 if params[:id]
                   @time_entry = TimeEntry.find(params[:id])
                   @project = @time_entry.project
                 elsif params[:issue_id]
                   @issue = Issue.find(params[:issue_id])
                   @project = @issue.project
                 elsif params[:project_id]
                   @project = Project.find(params[:project_id])
                 else
                   render_404
                   return false
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 if !params[:issue_id].blank?
                   @issue = Issue.find(params[:issue_id])
                   @project = @issue.project
                 elsif !params[:project_id].blank?
                   @project = Project.find(params[:project_id])
                 end
                 deny_access unless User.current.allowed_to?(:view_time_entries, @project, :global => true)
               end
               # Retrieves the date range based on predefined ranges or specific from/to param dates
               def retrieve_date_range
                 @free_period = false
                 @from, @to = nil, nil
                 if params[:period_type] == '1' || (params[:period_type].nil? && !params[:period].nil?)
                   case params[:period].to_s
                   when 'today'
                     @from = @to = Date.today
                   when 'yesterday'
                     @from = @to = Date.today - 1
                   when 'current_week'
                     @from = Date.today - (Date.today.cwday - 1)%7
                     @to = @from + 6
                   when 'last_week'
                     @from = Date.today - 7 - (Date.today.cwday - 1)%7
                     @to = @from + 6
                   when '7_days'
                     @from = Date.today - 7
                     @to = Date.today
                   when 'current_month'
                     @from = Date.civil(Date.today.year, Date.today.month, 1)
                     @to = (@from >> 1) - 1
                   when 'last_month'
                     @from = Date.civil(Date.today.year, Date.today.month, 1) << 1
                     @to = (@from >> 1) - 1
                   when '30_days'
                     @from = Date.today - 30
                     @to = Date.today
                   when 'current_year'
                     @from = Date.civil(Date.today.year, 1, 1)
                     @to = Date.civil(Date.today.year, 12, 31)
                   end
                 elsif params[:period_type] == '2' || (params[:period_type].nil? && (!params[:from].nil? || !params[:to].nil?))
                   begin; @from = params[:from].to_s.to_date unless params[:from].blank?; rescue; end
                   begin; @to = params[:to].to_s.to_date unless params[:to].blank?; rescue; end
                   @free_period = true
                 else
                   # default
                 end
                 @from, @to = @to, @from if @from && @to && @from > @to
                 @from ||= (TimeEntry.minimum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries)) || Date.today) - 1
                 @to   ||= (TimeEntry.maximum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries)) || Date.today)
               end
             end

app/controllers/users_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 UsersController < ApplicationController
               before_filter :require_admin
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               def list
                 sort_init 'login', 'asc'
-                sort_update
+                sort_update %w(login firstname lastname mail admin created_on last_login_on)
                 @status = params[:status] ? params[:status].to_i : 1
                 c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
                 unless params[:name].blank?
                   name = "%#{params[:name].strip.downcase}%"
                   c << ["LOWER(login) LIKE ? OR LOWER(firstname) LIKE ? OR LOWER(lastname) LIKE ?", name, name, name]
                 end
                 @user_count = User.count(:conditions => c.conditions)
                 @user_pages = Paginator.new self, @user_count,
             								per_page_option,
             								params['page']
                 @users =  User.find :all,:order => sort_clause,
                                     :conditions => c.conditions,
             						:limit  =>  @user_pages.items_per_page,
             						:offset =>  @user_pages.current.offset
                 render :action => "list", :layout => false if request.xhr?
               end
               def add
                 if request.get?
                   @user = User.new(:language => Setting.default_language)
                 else
                   @user = User.new(params[:user])
                   @user.admin = params[:user][:admin] || false
                   @user.login = params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
                   if @user.save
                     Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list'
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
               end
               def edit
                 @user = User.find(params[:id])
                 if request.post?
                   @user.admin = params[:user][:admin] if params[:user][:admin]
                   @user.login = params[:user][:login] if params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
                   if @user.update_attributes(params[:user])
                     flash[:notice] = l(:notice_successful_update)
                     # Give a string to redirect_to otherwise it would use status param as the response code
                     redirect_to(url_for(:action => 'list', :status => params[:status], :page => params[:page]))
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
                 @roles = Role.find_all_givable
                 @projects = Project.find(:all, :order => 'name', :conditions => "status=#{Project::STATUS_ACTIVE}") - @user.projects
                 @membership ||= Member.new
                 @memberships = @user.memberships
               end
               def edit_membership
                 @user = User.find(params[:id])
                 @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:user => @user)
                 @membership.attributes = params[:membership]
                 @membership.save if request.post?
                 redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
               end
               def destroy_membership
                 @user = User.find(params[:id])
                 Member.find(params[:membership_id]).destroy if request.post?
                 redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
               end
             end

app/helpers/queries_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 QueriesHelper
               def operators_for_select(filter_type)
                 Query.operators_by_filter_type[filter_type].collect {|o| [l(Query.operators[o]), o]}
               end
               def column_header(column)
-                column.sortable ? sort_header_tag(column.sortable, :caption => column.caption,
+                column.sortable ? sort_header_tag(column.name.to_s, :caption => column.caption,
-                                                                   :default_order => column.default_order) :
+                                                                    :default_order => column.default_order) :
                                   content_tag('th', column.caption)
               end
               def column_content(column, issue)
                 if column.is_a?(QueryCustomFieldColumn)
                   cv = issue.custom_values.detect {|v| v.custom_field_id == column.custom_field.id}
                   show_value(cv)
                 else
                   value = issue.send(column.name)
                   if value.is_a?(Date)
                     format_date(value)
                   elsif value.is_a?(Time)
                     format_time(value)
                   else
                     case column.name
                     when :subject
                     h((@project.nil? || @project != issue.project) ? "#{issue.project.name} - " : '') +
                       link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
                     when :done_ratio
                       progress_bar(value, :width => '80px')
                     when :fixed_version
                       link_to(h(value), { :controller => 'versions', :action => 'show', :id => issue.fixed_version_id })
                     else
                       h(value)
                     end
                   end
                 end
               end
             end

app/helpers/sort_helper.rb +13 -5

             # Helpers to sort tables using clickable column headers.
             #
             # Author:  Stuart Rackham <srackham@methods.co.nz>, March 2005.
             # License: This source code is released under the MIT license.
             #
             # - Consecutive clicks toggle the column's sort order.
             # - Sort state is maintained by a session hash entry.
             # - Icon image identifies sort column and state.
             # - Typically used in conjunction with the Pagination module.
             #
             # Example code snippets:
             #
             # Controller:
             #
             #   helper :sort
             #   include SortHelper
             #
             #   def list
             #     sort_init 'last_name'
             #     sort_update
             #     @items = Contact.find_all nil, sort_clause
             #   end
             #
             # Controller (using Pagination module):
             #
             #   helper :sort
             #   include SortHelper
             #
             #   def list
             #     sort_init 'last_name'
             #     sort_update
             #     @contact_pages, @items = paginate :contacts,
             #       :order_by => sort_clause,
             #       :per_page => 10
             #   end
             #
             # View (table header in list.rhtml):
             #
             #   <thead>
             #     <tr>
             #       <%= sort_header_tag('id', :title => 'Sort by contact ID') %>
             #       <%= sort_header_tag('last_name', :caption => 'Name') %>
             #       <%= sort_header_tag('phone') %>
             #       <%= sort_header_tag('address', :width => 200) %>
             #     </tr>
             #   </thead>
             #
             # - The ascending and descending sort icon images are sort_asc.png and
             #   sort_desc.png and reside in the application's images directory.
             # - Introduces instance variables: @sort_name, @sort_default.
             # - Introduces params :sort_key and :sort_order.
             #
             module SortHelper
               # Initializes the default sort column (default_key) and sort order
               # (default_order).
               #
               # - default_key is a column attribute name.
               # - default_order is 'asc' or 'desc'.
               # - name is the name of the session hash entry that stores the sort state,
               #   defaults to '<controller_name>_sort'.
               #
               def sort_init(default_key, default_order='asc', name=nil)
                 @sort_name = name || params[:controller] + params[:action] + '_sort'
                 @sort_default = {:key => default_key, :order => default_order}
               end
               # Updates the sort state. Call this in the controller prior to calling
               # sort_clause.
+              # sort_keys can be either an array or a hash of allowed keys
-              def sort_update()
+              def sort_update(sort_keys)
-                if params[:sort_key]
+                sort_key = params[:sort_key]
-                  sort = {:key => params[:sort_key], :order => params[:sort_order]}
+                sort_key = nil unless (sort_keys.is_a?(Array) ? sort_keys.include?(sort_key) : sort_keys[sort_key])
+                sort_order = (params[:sort_order] == 'desc' ? 'DESC' : 'ASC')
+                if sort_key
+                  sort = {:key => sort_key, :order => sort_order}
                 elsif session[@sort_name]
                   sort = session[@sort_name]   # Previous sort.
                 else
                   sort = @sort_default
                 end
                 session[@sort_name] = sort
+                sort_column = (sort_keys.is_a?(Hash) ? sort_keys[sort[:key]] : sort[:key])
+                @sort_clause = (sort_column.blank? ? '' : "#{sort_column} #{sort[:order]}")
               end
               # Returns an SQL sort clause corresponding to the current sort state.
               # Use this to sort the controller's table items collection.
               #
               def sort_clause()
-                session[@sort_name][:key] + ' ' + (session[@sort_name][:order] || 'ASC')
+                @sort_clause || '' #session[@sort_name][:key] + ' ' + (session[@sort_name][:order] || 'ASC')
               end
               # Returns a link which sorts by the named column.
               #
               # - column is the name of an attribute in the sorted record collection.
               # - The optional caption explicitly specifies the displayed link text.
               # - A sort icon image is positioned to the right of the sort link.
               #
               def sort_link(column, caption, default_order)
                 key, order = session[@sort_name][:key], session[@sort_name][:order]
                 if key == column
                   if order.downcase == 'asc'
                     icon = 'sort_asc.png'
                     order = 'desc'
                   else
                     icon = 'sort_desc.png'
                     order = 'asc'
                   end
                 else
                   icon = nil
                   order = default_order
                 end
                 caption = titleize(Inflector::humanize(column)) unless caption
                 sort_options = { :sort_key => column, :sort_order => order }
                 # don't reuse params if filters are present
                 url_options = params.has_key?(:set_filter) ? sort_options : params.merge(sort_options)
                 link_to_remote(caption,
                               {:update => "content", :url => url_options},
                               {:href => url_for(url_options)}) +
                 (icon ? nbsp(2) + image_tag(icon) : '')
               end
               # Returns a table header <th> tag with a sort link for the named column
               # attribute.
               #
               # Options:
               #   :caption     The displayed link name (defaults to titleized column name).
               #   :title       The tag's 'title' attribute (defaults to 'Sort by :caption').
               #
               # Other options hash entries generate additional table header tag attributes.
               #
               # Example:
               #
               #   <%= sort_header_tag('id', :title => 'Sort by contact ID', :width => 40) %>
               #
               # Renders:
               #
               #   <th title="Sort by contact ID" width="40">
               #     <a href="/contact/list?sort_order=desc&amp;sort_key=id">Id</a>
               #     &nbsp;&nbsp;<img alt="Sort_asc" src="/images/sort_asc.png" />
               #   </th>
               #
               def sort_header_tag(column, options = {})
                 caption = options.delete(:caption) || titleize(Inflector::humanize(column))
                 default_order = options.delete(:default_order) || 'asc'
                 options[:title]= l(:label_sort_by, "\"#{caption}\"") unless options[:title]
                 content_tag('th', sort_link(column, caption, default_order), options)
               end
               private
                 # Return n non-breaking spaces.
                 def nbsp(n)
                   '&nbsp;' * n
                 end
                 # Return capitalized title.
                 def titleize(title)
                   title.split.map {|w| w.capitalize }.join(' ')
                 end
             end

app/models/mailer.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 Mailer < ActionMailer::Base
               helper :application
               helper :issues
               helper :custom_fields
               include ActionController::UrlWriter
               def issue_add(issue)
                 redmine_headers 'Project' => issue.project.identifier,
                                 'Issue-Id' => issue.id,
                                 'Issue-Author' => issue.author.login
                 redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
                 recipients issue.recipients
                 subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}"
                 body :issue => issue,
                      :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
               end
               def issue_edit(journal)
                 issue = journal.journalized
                 redmine_headers 'Project' => issue.project.identifier,
                                 'Issue-Id' => issue.id,
                                 'Issue-Author' => issue.author.login
                 redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
                 recipients issue.recipients
                 # Watchers in cc
                 cc(issue.watcher_recipients - @recipients)
                 s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] "
                 s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
                 s << issue.subject
                 subject s
                 body :issue => issue,
                      :journal => journal,
                      :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
               end
               def reminder(user, issues, days)
                 set_language_if_valid user.language
                 recipients user.mail
                 subject l(:mail_subject_reminder, issues.size)
                 body :issues => issues,
                      :days => days,
-                     :issues_url => url_for(:controller => 'issues', :action => 'index', :set_filter => 1, :assigned_to_id => user.id, :sort_key => 'issues.due_date', :sort_order => 'asc')
+                     :issues_url => url_for(:controller => 'issues', :action => 'index', :set_filter => 1, :assigned_to_id => user.id, :sort_key => 'due_date', :sort_order => 'asc')
               end
               def document_added(document)
                 redmine_headers 'Project' => document.project.identifier
                 recipients document.project.recipients
                 subject "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
                 body :document => document,
                      :document_url => url_for(:controller => 'documents', :action => 'show', :id => document)
               end
               def attachments_added(attachments)
                 container = attachments.first.container
                 added_to = ''
                 added_to_url = ''
                 case container.class.name
                 when 'Version'
                   added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container.project_id)
                   added_to = "#{l(:label_version)}: #{container.name}"
                 when 'Document'
                   added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
                   added_to = "#{l(:label_document)}: #{container.title}"
                 end
                 redmine_headers 'Project' => container.project.identifier
                 recipients container.project.recipients
                 subject "[#{container.project.name}] #{l(:label_attachment_new)}"
                 body :attachments => attachments,
                      :added_to => added_to,
                      :added_to_url => added_to_url
               end
               def news_added(news)
                 redmine_headers 'Project' => news.project.identifier
                 recipients news.project.recipients
                 subject "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
                 body :news => news,
                      :news_url => url_for(:controller => 'news', :action => 'show', :id => news)
               end
               def message_posted(message, recipients)
                 redmine_headers 'Project' => message.project.identifier,
                                 'Topic-Id' => (message.parent_id || message.id)
                 recipients(recipients)
                 subject "[#{message.board.project.name} - #{message.board.name}] #{message.subject}"
                 body :message => message,
                      :message_url => url_for(:controller => 'messages', :action => 'show', :board_id => message.board_id, :id => message.root)
               end
               def account_information(user, password)
                 set_language_if_valid user.language
                 recipients user.mail
                 subject l(:mail_subject_register, Setting.app_title)
                 body :user => user,
                      :password => password,
                      :login_url => url_for(:controller => 'account', :action => 'login')
               end
               def account_activation_request(user)
                 # Send the email to all active administrators
                 recipients User.active.find(:all, :conditions => {:admin => true}).collect { |u| u.mail }.compact
                 subject l(:mail_subject_account_activation_request, Setting.app_title)
                 body :user => user,
                      :url => url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, :sort_key => 'created_on', :sort_order => 'desc')
               end
               def lost_password(token)
                 set_language_if_valid(token.user.language)
                 recipients token.user.mail
                 subject l(:mail_subject_lost_password, Setting.app_title)
                 body :token => token,
                      :url => url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
               end
               def register(token)
                 set_language_if_valid(token.user.language)
                 recipients token.user.mail
                 subject l(:mail_subject_register, Setting.app_title)
                 body :token => token,
                      :url => url_for(:controller => 'account', :action => 'activate', :token => token.value)
               end
               def test(user)
                 set_language_if_valid(user.language)
                 recipients user.mail
                 subject 'Redmine test'
                 body :url => url_for(:controller => 'welcome')
               end
               # Overrides default deliver! method to prevent from sending an email
               # with no recipient, cc or bcc
               def deliver!(mail = @mail)
                 return false if (recipients.nil? || recipients.empty?) &&
                                 (cc.nil? || cc.empty?) &&
                                 (bcc.nil? || bcc.empty?)
                 super
               end
               # Sends reminders to issue assignees
               # Available options:
               # * :days     => how many days in the future to remind about (defaults to 7)
               # * :tracker  => id of tracker for filtering issues (defaults to all trackers)
               # * :project  => id or identifier of project to process (defaults to all projects)
               def self.reminders(options={})
                 days = options[:days] || 7
                 project = options[:project] ? Project.find(options[:project]) : nil
                 tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil
                 s = ARCondition.new ["#{IssueStatus.table_name}.is_closed = ? AND #{Issue.table_name}.due_date <= ?", false, days.day.from_now.to_date]
                 s << "#{Issue.table_name}.assigned_to_id IS NOT NULL"
                 s << "#{Project.table_name}.status = #{Project::STATUS_ACTIVE}"
                 s << "#{Issue.table_name}.project_id = #{project.id}" if project
                 s << "#{Issue.table_name}.tracker_id = #{tracker.id}" if tracker
                 issues_by_assignee = Issue.find(:all, :include => [:status, :assigned_to, :project, :tracker],
                                                       :conditions => s.conditions
                                                 ).group_by(&:assigned_to)
                 issues_by_assignee.each do |assignee, issues|
                   deliver_reminder(assignee, issues, days) unless assignee.nil?
                 end
               end
               private
               def initialize_defaults(method_name)
                 super
                 set_language_if_valid Setting.default_language
                 from Setting.mail_from
                 # URL options
                 h = Setting.host_name
                 h = h.to_s.gsub(%r{\/.*$}, '') unless ActionController::AbstractRequest.relative_url_root.blank?
                 default_url_options[:host] = h
                 default_url_options[:protocol] = Setting.protocol
                 # Common headers
                 headers 'X-Mailer' => 'Redmine',
                         'X-Redmine-Host' => Setting.host_name,
                         'X-Redmine-Site' => Setting.app_title
               end
               # Appends a Redmine header field (name is prepended with 'X-Redmine-')
               def redmine_headers(h)
                 h.each { |k,v| headers["X-Redmine-#{k}"] = v }
               end
               # Overrides the create_mail method
               def create_mail
                 # Removes the current user from the recipients and cc
                 # if he doesn't want to receive notifications about what he does
                 if User.current.pref[:no_self_notified]
                   recipients.delete(User.current.mail) if recipients
                   cc.delete(User.current.mail) if cc
                 end
                 # Blind carbon copy recipients
                 if Setting.bcc_recipients?
                   bcc([recipients, cc].flatten.compact.uniq)
                   recipients []
                   cc []
                 end
                 super
               end
               # Renders a message with the corresponding layout
               def render_message(method_name, body)
                 layout = method_name.match(%r{text\.html\.(rhtml|rxml)}) ? 'layout.text.html.rhtml' : 'layout.text.plain.rhtml'
                 body[:content_for_layout] = render(:file => method_name, :body => body)
                 ActionView::Base.new(template_root, body, self).render(:file => "mailer/#{layout}", :use_full_path => true)
               end
               # for the case of plain text only
               def body(*params)
                 value = super(*params)
                 if Setting.plain_text_mail?
                   templates = Dir.glob("#{template_path}/#{@template}.text.plain.{rhtml,erb}")
                   unless String === @body or templates.empty?
                     template = File.basename(templates.first)
                     @body[:content_for_layout] = render(:file => template, :body => @body)
                     @body = ActionView::Base.new(template_root, @body, self).render(:file => "mailer/layout.text.plain.rhtml", :use_full_path => true)
                     return @body
                   end
                 end
                 return value
               end
               # Makes partial rendering work with Rails 1.2 (retro-compatibility)
               def self.controller_path
                 ''
               end unless respond_to?('controller_path')
             end

app/views/boards/show.rhtml +3 -3

             <%= breadcrumb link_to(l(:label_board_plural), {:controller => 'boards', :action => 'index', :project_id => @project}) %>
             <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, :id => 'message-form'} do |f| %>
               <%= render :partial => 'messages/form', :locals => {:f => f} %>
               <p><%= submit_tag l(:button_create) %>
               <%= link_to_remote l(:label_preview),
                                  { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
                                    :method => 'post',
                                    :update => 'preview',
                                    :with => "Form.serialize('message-form')",
                                    :complete => "Element.scrollTo('preview')"
                                  }, :accesskey => accesskey(:preview) %> |
               <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-message")' %></p>
             <% end %>
             <div id="preview" class="wiki"></div>
             </div>
             <h2><%=h @board.name %></h2>
             <p class="subtitle"><%=h @board.description %></p>
             <% if @topics.any? %>
             <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)) %>
+                <%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
-                <%= sort_header_tag("#{Message.table_name}.replies_count", :caption => l(:label_reply_plural)) %>
+                <%= sort_header_tag('replies', :caption => l(:label_reply_plural)) %>
-                <%= sort_header_tag("#{Message.table_name}.updated_on", :caption => l(:label_message_last)) %>
+                <%= sort_header_tag('updated_on', :caption => l(:label_message_last)) %>
               </tr></thead>
               <tbody>
               <% @topics.each do |topic| %>
                 <tr class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
                   <td class="subject"><%= link_to h(topic.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => topic }, :class => 'icon' %></td>
                   <td class="author" align="center"><%= topic.author %></td>
                   <td class="created_on" align="center"><%= format_time(topic.created_on) %></td>
                   <td class="replies" align="center"><%= topic.replies_count %></td>
                   <td class="last_message">
                     <% if topic.last_reply %>
                     <%= authoring topic.last_reply.created_on, topic.last_reply.author %><br />
                     <%= link_to_message topic.last_reply %>
                     <% end %>
                   </td>
                 </tr>
               <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></p>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <% html_title h(@board.name) %>

app/views/issues/_list.rhtml +1 -1

             <% form_tag({}) do -%>
             <table class="list issues">
                 <thead><tr>
                     <th><%= link_to image_tag('toggle_check.png'), {}, :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;',
                                                                        :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
                     </th>
-            		<%= sort_header_tag("#{Issue.table_name}.id", :caption => '#', :default_order => 'desc') %>
+            		<%= sort_header_tag('id', :caption => '#', :default_order => 'desc') %>
                     <% query.columns.each do |column| %>
                       <%= column_header(column) %>
                     <% end %>
             	</tr></thead>
             	<tbody>
             	<% issues.each do |issue| -%>
             	<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= css_issue_classes(issue) %>">
             	    <td class="checkbox"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
             		<td><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
                     <% query.columns.each do |column| %><%= content_tag 'td', column_content(column, issue), :class => column.name %><% end %>
             	</tr>
             	<% end -%>
             	</tbody>
             </table>
             <% end -%>

app/views/issues/_sidebar.rhtml +1 -1

             <h3><%= l(:label_issue_plural) %></h3>
             <%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />
             <% if @project %>
             <%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
             <%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %><br />
             <% end %>
             <%= call_hook(:view_issues_sidebar_issues_bottom) %>
             <% planning_links = []
               planning_links << link_to(l(:label_calendar), :action => 'calendar', :project_id => @project) if User.current.allowed_to?(:view_calendar, @project, :global => true)
               planning_links << link_to(l(:label_gantt), :action => 'gantt', :project_id => @project) if User.current.allowed_to?(:view_gantt, @project, :global => true)
             %>
             <% unless planning_links.empty? %>
             <h3><%= l(:label_planning) %></h3>
             <p><%= planning_links.join(' | ') %></p>
             <%= call_hook(:view_issues_sidebar_planning_bottom) %>
             <% end %>
             <% unless sidebar_queries.empty? -%>
             <h3><%= l(:label_query_plural) %></h3>
             <% sidebar_queries.each do |query| -%>
-            <%= link_to query.name, :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %><br />
+            <%= link_to(h(query.name), :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query) %><br />
             <% end -%>
             <%= call_hook(:view_issues_sidebar_queries_bottom) %>
             <% end -%>

app/views/projects/list_files.rhtml +4 -4

             <div class="contextual">
             <%= link_to_if_authorized l(:label_attachment_new), {:controller => 'projects', :action => 'add_file', :id => @project}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_attachment_plural)%></h2>
             <% delete_allowed = authorize_for('versions', 'destroy_file') %>
             <table class="list">
               <thead><tr>
                 <th><%=l(:field_version)%></th>
-                <%= sort_header_tag("#{Attachment.table_name}.filename", :caption => l(:field_filename)) %>
+                <%= sort_header_tag('filename', :caption => l(:field_filename)) %>
-                <%= sort_header_tag("#{Attachment.table_name}.created_on", :caption => l(:label_date), :default_order => 'desc') %>
+                <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %>
-                <%= sort_header_tag("#{Attachment.table_name}.filesize", :caption => l(:field_filesize), :default_order => 'desc') %>
+                <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc') %>
-                <%= sort_header_tag("#{Attachment.table_name}.downloads", :caption => l(:label_downloads_abbr), :default_order => 'desc') %>
+                <%= sort_header_tag('downloads', :caption => l(:label_downloads_abbr), :default_order => 'desc') %>
                 <th>MD5</th>
                 <% if delete_allowed %><th></th><% end %>
               </tr></thead>
               <tbody>
             <% for version in @versions %>
               <% unless version.attachments.empty? %>
               <tr><th colspan="7" align="left"><span class="icon icon-package"><b><%= version.name %></b></span></th></tr>
               <% for file in version.attachments %>
               <tr class="<%= cycle("odd", "even") %>">
                 <td></td>
                 <td><%= link_to_attachment file, :download => true, :title => file.description %></td>
                 <td align="center"><%= format_time(file.created_on) %></td>
                 <td align="center"><%= number_to_human_size(file.filesize) %></td>
                 <td align="center"><%= file.downloads %></td>
                 <td align="center"><small><%= file.digest %></small></td>
                 <% if delete_allowed %>
                 <td align="center">
                     <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :method => :post %>
                 </td>
                 <% end %>
               </tr>
               <% end
               reset_cycle %>
               <% end %>
             <% end %>
               </tbody>
             </table>
             <% html_title(l(:label_attachment_plural)) -%>

app/views/timelog/_list.rhtml +4 -4

             <table class="list time-entries">
             <thead>
             <tr>
             <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
-            <%= sort_header_tag('user_id', :caption => l(:label_member)) %>
+            <%= sort_header_tag('user', :caption => l(:label_member)) %>
-            <%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>
+            <%= sort_header_tag('activity', :caption => l(:label_activity)) %>
-            <%= sort_header_tag("#{Project.table_name}.name", :caption => l(:label_project)) %>
+            <%= sort_header_tag('project', :caption => l(:label_project)) %>
-            <%= sort_header_tag('issue_id', :caption => l(:label_issue), :default_order => 'desc') %>
+            <%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %>
             <th><%= l(:field_comments) %></th>
             <%= sort_header_tag('hours', :caption => l(:field_hours)) %>
             <th></th>
             </tr>
             </thead>
             <tbody>
             <% entries.each do |entry| -%>
             <tr class="time-entry <%= cycle("odd", "even") %>">
             <td class="spent_on"><%= format_date(entry.spent_on) %></td>
             <td class="user"><%=h entry.user %></td>
             <td class="activity"><%=h entry.activity %></td>
             <td class="project"><%=h entry.project %></td>
             <td class="subject">
             <% if entry.issue -%>
             <%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) -%>
             <% end -%>
             </td>
             <td class="comments"><%=h entry.comments %></td>
             <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
             <td align="center">
             <% if entry.editable_by?(User.current) -%>
                 <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry, :project_id => nil},
                                                    :title => l(:button_edit) %>
                 <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry, :project_id => nil},
                                                      :confirm => l(:text_are_you_sure),
                                                      :method => :post,
                                                      :title => l(:button_delete) %>
             <% end -%>
             </td>
             </tr>
             <% end -%>
             </tbody>
             </table>

app/views/wiki/annotate.rhtml +1 -1

             <div class="contextual">
             <%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') %>
             <%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
             </div>
             <h2><%= @page.pretty_title %></h2>
             <p>
             <%= l(:label_version) %> <%= link_to @annotate.content.version, :action => 'index', :page => @page.title, :version => @annotate.content.version %>
             <em>(<%= @annotate.content.author ? @annotate.content.author.name : "anonyme" %>, <%= format_time(@annotate.content.updated_on) %>)</em>
             </p>
             <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
             <table class="filecontent annotate CodeRay ">
             <tbody>
             <% line_num = 1 %>
             <% @annotate.lines.each do |line| -%>
             <tr class="bloc-<%= colors[line[0]] %>">
                 <th class="line-num"><%= line_num %></th>
                 <td class="revision"><%= link_to line[0], :controller => 'wiki', :action => 'index', :id => @project, :page => @page.title, :version => line[0] %></td>
                 <td class="author"><%= h(line[1]) %></td>
-                <td class="line-code"><pre><%= line[2] %></pre></td>
+                <td class="line-code"><pre><%=h line[2] %></pre></td>
             </tr>
             <% line_num += 1 %>
             <% end -%>
             </tbody>
             </table>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag 'scm' %>
             <% end %>

lib/redcloth3.rb +9 -6

             #                                vim:ts=4:sw=4:
             # = RedCloth - Textile and Markdown Hybrid for Ruby
             #
             # Homepage::  http://whytheluckystiff.net/ruby/redcloth/
             # Author::    why the lucky stiff (http://whytheluckystiff.net/)
             # Copyright:: (cc) 2004 why the lucky stiff (and his puppet organizations.)
             # License::   BSD
             #
             # (see http://hobix.com/textile/ for a Textile Reference.)
             #
             # Based on (and also inspired by) both:
             #
             # PyTextile: http://diveintomark.org/projects/textile/textile.py.txt
             # Textism for PHP: http://www.textism.com/tools/textile/
             #
             #
             # = RedCloth
             #
             # RedCloth is a Ruby library for converting Textile and/or Markdown
             # into HTML.  You can use either format, intermingled or separately.
             # You can also extend RedCloth to honor your own custom text stylings.
             #
             # RedCloth users are encouraged to use Textile if they are generating
             # HTML and to use Markdown if others will be viewing the plain text.
             #
             # == What is Textile?
             #
             # Textile is a simple formatting style for text
             # documents, loosely based on some HTML conventions.
             #
             # == Sample Textile Text
             #
             #  h2. This is a title
             #
             #  h3. This is a subhead
             #
             #  This is a bit of paragraph.
             #
             #  bq. This is a blockquote.
             #
             # = Writing Textile
             #
             # A Textile document consists of paragraphs.  Paragraphs
             # can be specially formatted by adding a small instruction
             # to the beginning of the paragraph.
             #
             #  h[n].   Header of size [n].
             #  bq.     Blockquote.
             #  #       Numeric list.
             #  *       Bulleted list.
             #
             # == Quick Phrase Modifiers
             #
             # Quick phrase modifiers are also included, to allow formatting
             # of small portions of text within a paragraph.
             #
             #  \_emphasis\_
             #  \_\_italicized\_\_
             #  \*strong\*
             #  \*\*bold\*\*
             #  ??citation??
             #  -deleted text-
             #  +inserted text+
             #  ^superscript^
             #  ~subscript~
             #  @code@
             #  %(classname)span%
             #
             #  ==notextile== (leave text alone)
             #
             # == Links
             #
             # To make a hypertext link, put the link text in "quotation
             # marks" followed immediately by a colon and the URL of the link.
             #
             # Optional: text in (parentheses) following the link text,
             # but before the closing quotation mark, will become a Title
             # attribute for the link, visible as a tool tip when a cursor is above it.
             #
             # Example:
             #
             #  "This is a link (This is a title) ":http://www.textism.com
             #
             # Will become:
             #
             #  <a href="http://www.textism.com" title="This is a title">This is a link</a>
             #
             # == Images
             #
             # To insert an image, put the URL for the image inside exclamation marks.
             #
             # Optional: text that immediately follows the URL in (parentheses) will
             # be used as the Alt text for the image. Images on the web should always
             # have descriptive Alt text for the benefit of readers using non-graphical
             # browsers.
             #
             # Optional: place a colon followed by a URL immediately after the
             # closing ! to make the image into a link.
             #
             # Example:
             #
             #  !http://www.textism.com/common/textist.gif(Textist)!
             #
             # Will become:
             #
             #  <img src="http://www.textism.com/common/textist.gif" alt="Textist" />
             #
             # With a link:
             #
             #  !/common/textist.gif(Textist)!:http://textism.com
             #
             # Will become:
             #
             #  <a href="http://textism.com"><img src="/common/textist.gif" alt="Textist" /></a>
             #
             # == Defining Acronyms
             #
             # HTML allows authors to define acronyms via the tag. The definition appears as a
             # tool tip when a cursor hovers over the acronym. A crucial aid to clear writing,
             # this should be used at least once for each acronym in documents where they appear.
             #
             # To quickly define an acronym in Textile, place the full text in (parentheses)
             # immediately following the acronym.
             #
             # Example:
             #
             #  ACLU(American Civil Liberties Union)
             #
             # Will become:
             #
             #  <acronym title="American Civil Liberties Union">ACLU</acronym>
             #
             # == Adding Tables
             #
             # In Textile, simple tables can be added by seperating each column by
             # a pipe.
             #
             #     |a|simple|table|row|
             #     |And|Another|table|row|
             #
             # Attributes are defined by style definitions in parentheses.
             #
             #     table(border:1px solid black).
             #     (background:#ddd;color:red). |{}| | | |
             #
             # == Using RedCloth
             #
             # RedCloth is simply an extension of the String class, which can handle
             # Textile formatting.  Use it like a String and output HTML with its
             # RedCloth#to_html method.
             #
             #  doc = RedCloth.new "
             #
             #  h2. Test document
             #
             #  Just a simple test."
             #
             #  puts doc.to_html
             #
             # By default, RedCloth uses both Textile and Markdown formatting, with
             # Textile formatting taking precedence.  If you want to turn off Markdown
             # formatting, to boost speed and limit the processor:
             #
             #  class RedCloth::Textile.new( str )
             class RedCloth3 < String
                 VERSION = '3.0.4'
                 DEFAULT_RULES = [:textile, :markdown]
                 #
                 # Two accessor for setting security restrictions.
                 #
                 # This is a nice thing if you're using RedCloth for
                 # formatting in public places (e.g. Wikis) where you
                 # don't want users to abuse HTML for bad things.
                 #
                 # If +:filter_html+ is set, HTML which wasn't
                 # created by the Textile processor will be escaped.
                 #
                 # If +:filter_styles+ is set, it will also disable
                 # the style markup specifier. ('{color: red}')
                 #
                 attr_accessor :filter_html, :filter_styles
                 #
                 # Accessor for toggling hard breaks.
                 #
                 # If +:hard_breaks+ is set, single newlines will
                 # be converted to HTML break tags.  This is the
                 # default behavior for traditional RedCloth.
                 #
                 attr_accessor :hard_breaks
                 # Accessor for toggling lite mode.
                 #
                 # In lite mode, block-level rules are ignored.  This means
                 # that tables, paragraphs, lists, and such aren't available.
                 # Only the inline markup for bold, italics, entities and so on.
                 #
                 #   r = RedCloth.new( "And then? She *fell*!", [:lite_mode] )
                 #   r.to_html
                 #   #=> "And then? She <strong>fell</strong>!"
                 #
                 attr_accessor :lite_mode
                 #
                 # Accessor for toggling span caps.
                 #
                 # Textile places `span' tags around capitalized
                 # words by default, but this wreaks havoc on Wikis.
                 # If +:no_span_caps+ is set, this will be
                 # suppressed.
                 #
                 attr_accessor :no_span_caps
                 #
                 # Establishes the markup predence.  Available rules include:
                 #
                 # == Textile Rules
                 #
                 # The following textile rules can be set individually.  Or add the complete
                 # set of rules with the single :textile rule, which supplies the rule set in
                 # the following precedence:
                 #
                 # refs_textile::          Textile references (i.e. [hobix]http://hobix.com/)
                 # block_textile_table::   Textile table block structures
                 # block_textile_lists::   Textile list structures
                 # block_textile_prefix::  Textile blocks with prefixes (i.e. bq., h2., etc.)
                 # inline_textile_image::  Textile inline images
                 # inline_textile_link::   Textile inline links
                 # inline_textile_span::   Textile inline spans
                 # glyphs_textile:: Textile entities (such as em-dashes and smart quotes)
                 #
                 # == Markdown
                 #
                 # refs_markdown::         Markdown references (for example: [hobix]: http://hobix.com/)
                 # block_markdown_setext:: Markdown setext headers
                 # block_markdown_atx::    Markdown atx headers
                 # block_markdown_rule::   Markdown horizontal rules
                 # block_markdown_bq::     Markdown blockquotes
                 # block_markdown_lists::  Markdown lists
                 # inline_markdown_link::  Markdown links
                 attr_accessor :rules
                 # Returns a new RedCloth object, based on _string_ and
                 # enforcing all the included _restrictions_.
                 #
                 #   r = RedCloth.new( "h1. A <b>bold</b> man", [:filter_html] )
                 #   r.to_html
                 #     #=>"<h1>A &lt;b&gt;bold&lt;/b&gt; man</h1>"
                 #
                 def initialize( string, restrictions = [] )
                     restrictions.each { |r| method( "#{ r }=" ).call( true ) }
                     super( string )
                 end
                 #
                 # Generates HTML from the Textile contents.
                 #
                 #   r = RedCloth.new( "And then? She *fell*!" )
                 #   r.to_html( true )
                 #     #=>"And then? She <strong>fell</strong>!"
                 #
                 def to_html( *rules )
                     rules = DEFAULT_RULES if rules.empty?
                     # make our working copy
                     text = self.dup
                     @urlrefs = {}
                     @shelf = []
                     textile_rules = [:refs_textile, :block_textile_table, :block_textile_lists,
                                      :block_textile_prefix, :inline_textile_image, :inline_textile_link,
                                      :inline_textile_code, :inline_textile_span, :glyphs_textile]
                     markdown_rules = [:refs_markdown, :block_markdown_setext, :block_markdown_atx, :block_markdown_rule,
                                       :block_markdown_bq, :block_markdown_lists,
                                       :inline_markdown_reflink, :inline_markdown_link]
                     @rules = rules.collect do |rule|
                         case rule
                         when :markdown
                             markdown_rules
                         when :textile
                             textile_rules
                         else
                             rule
                         end
                     end.flatten
                     # standard clean up
                     incoming_entities text
                     clean_white_space text
                     # start processor
                     @pre_list = []
                     rip_offtags text
                     no_textile text
                     escape_html_tags text
                     hard_break text
                     unless @lite_mode
                         refs text
                         # need to do this before text is split by #blocks
                         block_textile_quotes text
                         blocks text
                     end
                     inline text
                     smooth_offtags text
                     retrieve text
                     text.gsub!( /<\/?notextile>/, '' )
                     text.gsub!( /x%x%/, '&#38;' )
                     clean_html text if filter_html
                     text.strip!
                     text
                 end
                 #######
                 private
                 #######
                 #
                 # Mapping of 8-bit ASCII codes to HTML numerical entity equivalents.
                 # (from PyTextile)
                 #
                 TEXTILE_TAGS =
                     [[128, 8364], [129, 0], [130, 8218], [131, 402], [132, 8222], [133, 8230],
                      [134, 8224], [135, 8225], [136, 710], [137, 8240], [138, 352], [139, 8249],
                      [140, 338], [141, 0], [142, 0], [143, 0], [144, 0], [145, 8216], [146, 8217],
                      [147, 8220], [148, 8221], [149, 8226], [150, 8211], [151, 8212], [152, 732],
                      [153, 8482], [154, 353], [155, 8250], [156, 339], [157, 0], [158, 0], [159, 376]].
                     collect! do |a, b|
                         [a.chr, ( b.zero? and "" or "&#{ b };" )]
                     end
                 #
                 # Regular expressions to convert to HTML.
                 #
                 A_HLGN = /(?:(?:<>|<|>|\=|[()]+)+)/
                 A_VLGN = /[\-^~]/
                 C_CLAS = '(?:\([^)]+\))'
                 C_LNGE = '(?:\[[^\[\]]+\])'
                 C_STYL = '(?:\{[^}]+\})'
                 S_CSPN = '(?:\\\\\d+)'
                 S_RSPN = '(?:/\d+)'
                 A = "(?:#{A_HLGN}?#{A_VLGN}?|#{A_VLGN}?#{A_HLGN}?)"
                 S = "(?:#{S_CSPN}?#{S_RSPN}|#{S_RSPN}?#{S_CSPN}?)"
                 C = "(?:#{C_CLAS}?#{C_STYL}?#{C_LNGE}?|#{C_STYL}?#{C_LNGE}?#{C_CLAS}?|#{C_LNGE}?#{C_STYL}?#{C_CLAS}?)"
                 # PUNCT = Regexp::quote( '!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~' )
                 PUNCT = Regexp::quote( '!"#$%&\'*+,-./:;=?@\\^_`|~' )
                 PUNCT_NOQ = Regexp::quote( '!"#$&\',./:;=?@\\`|' )
                 PUNCT_Q = Regexp::quote( '*-_+^~%' )
                 HYPERLINK = '(\S+?)([^\w\s/;=\?]*?)(?=\s|<|$)'
                 # Text markup tags, don't conflict with block tags
                 SIMPLE_HTML_TAGS = [
                     'tt', 'b', 'i', 'big', 'small', 'em', 'strong', 'dfn', 'code',
                     'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'a', 'img', 'br',
                     'br', 'map', 'q', 'sub', 'sup', 'span', 'bdo'
                 ]
                 QTAGS = [
                     ['**', 'b', :limit],
                     ['*', 'strong', :limit],
                     ['??', 'cite', :limit],
                     ['-', 'del', :limit],
                     ['__', 'i', :limit],
                     ['_', 'em', :limit],
                     ['%', 'span', :limit],
                     ['+', 'ins', :limit],
                     ['^', 'sup', :limit],
                     ['~', 'sub', :limit]
                 ]
                 QTAGS.collect! do |rc, ht, rtype|
                     rcq = Regexp::quote rc
                     re =
                         case rtype
                         when :limit
                             /(^|[>\s\(])
                             (#{rcq})
                             (#{C})
                             (?::(\S+?))?
                             ([^\s\-].*?[^\s\-]|\w)
                             #{rcq}
                             (?=[[:punct:]]|\s|\)|$)/x
                         else
                             /(#{rcq})
                             (#{C})
                             (?::(\S+))?
                             ([^\s\-].*?[^\s\-]|\w)
                             #{rcq}/xm
                         end
                     [rc, ht, re, rtype]
                 end
                 # Elements to handle
                 GLYPHS = [
                 #   [ /([^\s\[{(>])?\'([dmst]\b|ll\b|ve\b|\s|:|$)/, '\1&#8217;\2' ], # single closing
                 #   [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)\'/, '\1&#8217;' ], # single closing
                 #   [ /\'(?=[#{PUNCT_Q}]*(s\b|[\s#{PUNCT_NOQ}]))/, '&#8217;' ], # single closing
                 #   [ /\'/, '&#8216;' ], # single opening
                 #   [ /</, '&lt;' ], # less-than
                 #   [ />/, '&gt;' ], # greater-than
                 #   [ /([^\s\[{(])?"(\s|:|$)/, '\1&#8221;\2' ], # double closing
                 #   [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)"/, '\1&#8221;' ], # double closing
                 #   [ /"(?=[#{PUNCT_Q}]*[\s#{PUNCT_NOQ}])/, '&#8221;' ], # double closing
                 #   [ /"/, '&#8220;' ], # double opening
                 #   [ /\b( )?\.{3}/, '\1&#8230;' ], # ellipsis
-                    [ /\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/, '<acronym title="\2">\1</acronym>' ], # 3+ uppercase acronym
+                #   [ /\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/, '<acronym title="\2">\1</acronym>' ], # 3+ uppercase acronym
                 #   [ /(^|[^"][>\s])([A-Z][A-Z0-9 ]+[A-Z0-9])([^<A-Za-z0-9]|$)/, '\1<span class="caps">\2</span>\3', :no_span_caps ], # 3+ uppercase caps
                 #   [ /(\.\s)?\s?--\s?/, '\1&#8212;' ], # em dash
                 #   [ /\s->\s/, ' &rarr; ' ], # right arrow
                 #   [ /\s-\s/, ' &#8211; ' ], # en dash
                 #   [ /(\d+) ?x ?(\d+)/, '\1&#215;\2' ], # dimension sign
                 #   [ /\b ?[(\[]TM[\])]/i, '&#8482;' ], # trademark
                 #   [ /\b ?[(\[]R[\])]/i, '&#174;' ], # registered
                 #   [ /\b ?[(\[]C[\])]/i, '&#169;' ] # copyright
                 ]
                 H_ALGN_VALS = {
                     '<' => 'left',
                     '=' => 'center',
                     '>' => 'right',
                     '<>' => 'justify'
                 }
                 V_ALGN_VALS = {
                     '^' => 'top',
                     '-' => 'middle',
                     '~' => 'bottom'
                 }
                 #
                 # Flexible HTML escaping
                 #
                 def htmlesc( str, mode=:Quotes )
                   if str
                     str.gsub!( '&', '&amp;' )
                     str.gsub!( '"', '&quot;' ) if mode != :NoQuotes
                     str.gsub!( "'", '&#039;' ) if mode == :Quotes
                     str.gsub!( '<', '&lt;')
                     str.gsub!( '>', '&gt;')
                   end
                   str
                 end
                 # Search and replace for Textile glyphs (quotes, dashes, other symbols)
                 def pgl( text )
-                    GLYPHS.each do |re, resub, tog|
+                    #GLYPHS.each do |re, resub, tog|
-                        next if tog and method( tog ).call
+                    #    next if tog and method( tog ).call
-                        text.gsub! re, resub
+                    #    text.gsub! re, resub
+                    #end
+                    text.gsub!(/\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/) do |m|
+                      "<acronym title=\"#{htmlesc $2}\">#{$1}</acronym>"
                     end
                 end
                 # Parses Textile attribute lists and builds an HTML attribute string
                 def pba( text_in, element = "" )
                     return '' unless text_in
                     style = []
                     text = text_in.dup
                     if element == 'td'
                         colspan = $1 if text =~ /\\(\d+)/
                         rowspan = $1 if text =~ /\/(\d+)/
                         style << "vertical-align:#{ v_align( $& ) };" if text =~ A_VLGN
                     end
-                    style << "#{ $1 };" if not filter_styles and
+                    style << "#{ htmlesc $1 };" if not filter_styles and
                         text.sub!( /\{([^}]*)\}/, '' )
                     lang = $1 if
                         text.sub!( /\[([^)]+?)\]/, '' )
                     cls = $1 if
                         text.sub!( /\(([^()]+?)\)/, '' )
                     style << "padding-left:#{ $1.length }em;" if
                         text.sub!( /([(]+)/, '' )
                     style << "padding-right:#{ $1.length }em;" if text.sub!( /([)]+)/, '' )
                     style << "text-align:#{ h_align( $& ) };" if text =~ A_HLGN
                     cls, id = $1, $2 if cls =~ /^(.*?)#(.*)$/
                     atts = ''
                     atts << " style=\"#{ style.join }\"" unless style.empty?
                     atts << " class=\"#{ cls }\"" unless cls.to_s.empty?
                     atts << " lang=\"#{ lang }\"" if lang
                     atts << " id=\"#{ id }\"" if id
                     atts << " colspan=\"#{ colspan }\"" if colspan
                     atts << " rowspan=\"#{ rowspan }\"" if rowspan
                     atts
                 end
                 TABLE_RE = /^(?:table(_?#{S}#{A}#{C})\. ?\n)?^(#{A}#{C}\.? ?\|.*?\|)(\n\n|\Z)/m
                 # Parses a Textile table block, building HTML from the result.
                 def block_textile_table( text )
                     text.gsub!( TABLE_RE ) do |matches|
                         tatts, fullrow = $~[1..2]
                         tatts = pba( tatts, 'table' )
                         tatts = shelve( tatts ) if tatts
                         rows = []
                         fullrow.each_line do |row|
                             ratts, row = pba( $1, 'tr' ), $2 if row =~ /^(#{A}#{C}\. )(.*)/m
                             cells = []
                             row.split( /(\|)(?![^\[\|]*\]\])/ )[1..-2].each do |cell|
                                 next if cell == '|'
                                 ctyp = 'd'
                                 ctyp = 'h' if cell =~ /^_/
                                 catts = ''
                                 catts, cell = pba( $1, 'td' ), $2 if cell =~ /^(_?#{S}#{A}#{C}\. ?)(.*)/
                                 catts = shelve( catts ) if catts
                                 cells << "\t\t\t<t#{ ctyp }#{ catts }>#{ cell }</t#{ ctyp }>"
                             end
                             ratts = shelve( ratts ) if ratts
                             rows << "\t\t<tr#{ ratts }>\n#{ cells.join( "\n" ) }\n\t\t</tr>"
                         end
                         "\t<table#{ tatts }>\n#{ rows.join( "\n" ) }\n\t</table>\n\n"
                     end
                 end
                 LISTS_RE = /^([#*]+?#{C} .*?)$(?![^#*])/m
                 LISTS_CONTENT_RE = /^([#*]+)(#{A}#{C}) (.*)$/m
                 # Parses Textile lists and generates HTML
                 def block_textile_lists( text )
                     text.gsub!( LISTS_RE ) do |match|
                         lines = match.split( /\n/ )
                         last_line = -1
                         depth = []
                         lines.each_with_index do |line, line_id|
                             if line =~ LISTS_CONTENT_RE
                                 tl,atts,content = $~[1..3]
                                 if depth.last
                                     if depth.last.length > tl.length
                                         (depth.length - 1).downto(0) do |i|
                                             break if depth[i].length == tl.length
                                             lines[line_id - 1] << "</li>\n\t</#{ lT( depth[i] ) }l>\n\t"
                                             depth.pop
                                         end
                                     end
                                     if depth.last and depth.last.length == tl.length
                                         lines[line_id - 1] << '</li>'
                                     end
                                 end
                                 unless depth.last == tl
                                     depth << tl
                                     atts = pba( atts )
                                     atts = shelve( atts ) if atts
                                     lines[line_id] = "\t<#{ lT(tl) }l#{ atts }>\n\t<li>#{ content }"
                                 else
                                     lines[line_id] = "\t\t<li>#{ content }"
                                 end
                                 last_line = line_id
                             else
                                 last_line = line_id
                             end
                             if line_id - last_line > 1 or line_id == lines.length - 1
                                 depth.delete_if do |v|
                                     lines[last_line] << "</li>\n\t</#{ lT( v ) }l>"
                                 end
                             end
                         end
                         lines.join( "\n" )
                     end
                 end
                 QUOTES_RE = /(^>+([^\n]*?)\n?)+/m
                 QUOTES_CONTENT_RE = /^([> ]+)(.*)$/m
                 def block_textile_quotes( text )
                   text.gsub!( QUOTES_RE ) do |match|
                     lines = match.split( /\n/ )
                     quotes = ''
                     indent = 0
                     lines.each do |line|
                       line =~ QUOTES_CONTENT_RE
                       bq,content = $1, $2
                       l = bq.count('>')
                       if l != indent
                         quotes << ("\n\n" + (l>indent ? '<blockquote>' * (l-indent) : '</blockquote>' * (indent-l)) + "\n\n")
                         indent = l
                       end
                       quotes << (content + "\n")
                     end
                     quotes << ("\n" + '</blockquote>' * indent + "\n\n")
                     quotes
                   end
                 end
                 CODE_RE = /(\W)
                     @
                     (?:\|(\w+?)\|)?
                     (.+?)
                     @
                     (?=\W)/x
                 def inline_textile_code( text )
                     text.gsub!( CODE_RE ) do |m|
                         before,lang,code,after = $~[1..4]
                         lang = " lang=\"#{ lang }\"" if lang
                         rip_offtags( "#{ before }<code#{ lang }>#{ code }</code>#{ after }" )
                     end
                 end
                 def lT( text )
                     text =~ /\#$/ ? 'o' : 'u'
                 end
                 def hard_break( text )
                     text.gsub!( /(.)\n(?!\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
                 end
                 BLOCKS_GROUP_RE = /\n{2,}(?! )/m
                 def blocks( text, deep_code = false )
                     text.replace( text.split( BLOCKS_GROUP_RE ).collect do |blk|
                         plain = blk !~ /\A[#*> ]/
                         # skip blocks that are complex HTML
                         if blk =~ /^<\/?(\w+).*>/ and not SIMPLE_HTML_TAGS.include? $1
                             blk
                         else
                             # search for indentation levels
                             blk.strip!
                             if blk.empty?
                                 blk
                             else
                                 code_blk = nil
                                 blk.gsub!( /((?:\n(?:\n^ +[^\n]*)+)+)/m ) do |iblk|
                                     flush_left iblk
                                     blocks iblk, plain
                                     iblk.gsub( /^(\S)/, "\t\\1" )
                                     if plain
                                         code_blk = iblk; ""
                                     else
                                         iblk
                                     end
                                 end
                                 block_applied = 0
                                 @rules.each do |rule_name|
                                     block_applied += 1 if ( rule_name.to_s.match /^block_/ and method( rule_name ).call( blk ) )
                                 end
                                 if block_applied.zero?
                                     if deep_code
                                         blk = "\t<pre><code>#{ blk }</code></pre>"
                                     else
                                         blk = "\t<p>#{ blk }</p>"
                                     end
                                 end
                                 # hard_break blk
                                 blk + "\n#{ code_blk }"
                             end
                         end
                     end.join( "\n\n" ) )
                 end
                 def textile_bq( tag, atts, cite, content )
                     cite, cite_title = check_refs( cite )
                     cite = " cite=\"#{ cite }\"" if cite
                     atts = shelve( atts ) if atts
                     "\t<blockquote#{ cite }>\n\t\t<p#{ atts }>#{ content }</p>\n\t</blockquote>"
                 end
                 def textile_p( tag, atts, cite, content )
                     atts = shelve( atts ) if atts
                     "\t<#{ tag }#{ atts }>#{ content }</#{ tag }>"
                 end
                 alias textile_h1 textile_p
                 alias textile_h2 textile_p
                 alias textile_h3 textile_p
                 alias textile_h4 textile_p
                 alias textile_h5 textile_p
                 alias textile_h6 textile_p
                 def textile_fn_( tag, num, atts, cite, content )
                     atts << " id=\"fn#{ num }\" class=\"footnote\""
                     content = "<sup>#{ num }</sup> #{ content }"
                     atts = shelve( atts ) if atts
                     "\t<p#{ atts }>#{ content }</p>"
                 end
                 BLOCK_RE = /^(([a-z]+)(\d*))(#{A}#{C})\.(?::(\S+))? (.*)$/m
                 def block_textile_prefix( text )
                     if text =~ BLOCK_RE
                         tag,tagpre,num,atts,cite,content = $~[1..6]
                         atts = pba( atts )
                         # pass to prefix handler
                         if respond_to? "textile_#{ tag }", true
                             text.gsub!( $&, method( "textile_#{ tag }" ).call( tag, atts, cite, content ) )
                         elsif respond_to? "textile_#{ tagpre }_", true
                             text.gsub!( $&, method( "textile_#{ tagpre }_" ).call( tagpre, num, atts, cite, content ) )
                         end
                     end
                 end
                 SETEXT_RE = /\A(.+?)\n([=-])[=-]* *$/m
                 def block_markdown_setext( text )
                     if text =~ SETEXT_RE
                         tag = if $2 == "="; "h1"; else; "h2"; end
                         blk, cont = "<#{ tag }>#{ $1 }</#{ tag }>", $'
                         blocks cont
                         text.replace( blk + cont )
                     end
                 end
                 ATX_RE = /\A(\#{1,6})  # $1 = string of #'s
                           [ ]*
                           (.+?)       # $2 = Header text
                           [ ]*
                           \#*         # optional closing #'s (not counted)
                           $/x
                 def block_markdown_atx( text )
                     if text =~ ATX_RE
                         tag = "h#{ $1.length }"
                         blk, cont = "<#{ tag }>#{ $2 }</#{ tag }>\n\n", $'
                         blocks cont
                         text.replace( blk + cont )
                     end
                 end
                 MARKDOWN_BQ_RE = /\A(^ *> ?.+$(.+\n)*\n*)+/m
                 def block_markdown_bq( text )
                     text.gsub!( MARKDOWN_BQ_RE ) do |blk|
                         blk.gsub!( /^ *> ?/, '' )
                         flush_left blk
                         blocks blk
                         blk.gsub!( /^(\S)/, "\t\\1" )
                         "<blockquote>\n#{ blk }\n</blockquote>\n\n"
                     end
                 end
                 MARKDOWN_RULE_RE = /^(#{
                     ['*', '-', '_'].collect { |ch| ' ?(' + Regexp::quote( ch ) + ' ?){3,}' }.join( '|' )
                 })$/
                 def block_markdown_rule( text )
                     text.gsub!( MARKDOWN_RULE_RE ) do |blk|
                         "<hr />"
                     end
                 end
                 # XXX TODO XXX
                 def block_markdown_lists( text )
                 end
                 def inline_textile_span( text )
                     QTAGS.each do |qtag_rc, ht, qtag_re, rtype|
                         text.gsub!( qtag_re ) do |m|
                             case rtype
                             when :limit
                                 sta,qtag,atts,cite,content = $~[1..5]
                             else
                                 qtag,atts,cite,content = $~[1..4]
                                 sta = ''
                             end
                             atts = pba( atts )
                             atts << " cite=\"#{ cite }\"" if cite
                             atts = shelve( atts ) if atts
                             "#{ sta }<#{ ht }#{ atts }>#{ content }</#{ ht }>"
                         end
                     end
                 end
                 LINK_RE = /
                         ([\s\[{(]|[#{PUNCT}])?     # $pre
                         "                          # start
                         (#{C})                     # $atts
                         ([^"\n]+?)                 # $text
                         \s?
                         (?:\(([^)]+?)\)(?="))?     # $title
                         ":
                         ([\w\/]\S+?)               # $url
                         (\/)?                      # $slash
                         ([^\w\=\/;\(\)]*?)         # $post
                         (?=<|\s|$)
                     /x
             #"
                 def inline_textile_link( text )
                     text.gsub!( LINK_RE ) do |m|
                         pre,atts,text,title,url,slash,post = $~[1..7]
                         url, url_title = check_refs( url )
                         title ||= url_title
                         # Idea below : an URL with unbalanced parethesis and
                         # ending by ')' is put into external parenthesis
                         if ( url[-1]==?) and ((url.count("(") - url.count(")")) < 0 ) )
                           url=url[0..-2] # discard closing parenth from url
                           post = ")"+post # add closing parenth to post
                         end
                         atts = pba( atts )
                         atts = " href=\"#{ url }#{ slash }\"#{ atts }"
-                        atts << " title=\"#{ title }\"" if title
+                        atts << " title=\"#{ htmlesc title }\"" if title
                         atts = shelve( atts ) if atts
                         external = (url =~ /^https?:\/\//) ? ' class="external"' : ''
                         "#{ pre }<a#{ atts }#{ external }>#{ text }</a>#{ post }"
                     end
                 end
                 MARKDOWN_REFLINK_RE = /
                         \[([^\[\]]+)\]      # $text
                         [ ]?                # opt. space
                         (?:\n[ ]*)?         # one optional newline followed by spaces
                         \[(.*?)\]           # $id
                     /x
                 def inline_markdown_reflink( text )
                     text.gsub!( MARKDOWN_REFLINK_RE ) do |m|
                         text, id = $~[1..2]
                         if id.empty?
                             url, title = check_refs( text )
                         else
                             url, title = check_refs( id )
                         end
                         atts = " href=\"#{ url }\""
                         atts << " title=\"#{ title }\"" if title
                         atts = shelve( atts )
                         "<a#{ atts }>#{ text }</a>"
                     end
                 end
                 MARKDOWN_LINK_RE = /
                         \[([^\[\]]+)\]      # $text
                         \(                  # open paren
                         [ \t]*              # opt space
                         <?(.+?)>?           # $href
                         [ \t]*              # opt space
                         (?:                 # whole title
                         (['"])              # $quote
                         (.*?)               # $title
                         \3                  # matching quote
                         )?                  # title is optional
                         \)
                     /x
                 def inline_markdown_link( text )
                     text.gsub!( MARKDOWN_LINK_RE ) do |m|
                         text, url, quote, title = $~[1..4]
                         atts = " href=\"#{ url }\""
                         atts << " title=\"#{ title }\"" if title
                         atts = shelve( atts )
                         "<a#{ atts }>#{ text }</a>"
                     end
                 end
                 TEXTILE_REFS_RE =  /(^ *)\[([^\[\n]+?)\](#{HYPERLINK})(?=\s|$)/
                 MARKDOWN_REFS_RE = /(^ *)\[([^\n]+?)\]:\s+<?(#{HYPERLINK})>?(?:\s+"((?:[^"]|\\")+)")?(?=\s|$)/m
                 def refs( text )
                     @rules.each do |rule_name|
                         method( rule_name ).call( text ) if rule_name.to_s.match /^refs_/
                     end
                 end
                 def refs_textile( text )
                     text.gsub!( TEXTILE_REFS_RE ) do |m|
                         flag, url = $~[2..3]
                         @urlrefs[flag.downcase] = [url, nil]
                         nil
                     end
                 end
                 def refs_markdown( text )
                     text.gsub!( MARKDOWN_REFS_RE ) do |m|
                         flag, url = $~[2..3]
                         title = $~[6]
                         @urlrefs[flag.downcase] = [url, title]
                         nil
                     end
                 end
                 def check_refs( text )
                     ret = @urlrefs[text.downcase] if text
                     ret || [text, nil]
                 end
                 IMAGE_RE = /
                         (<p>|.|^)            # start of line?
                         \!                   # opening
                         (\<|\=|\>)?          # optional alignment atts
                         (#{C})               # optional style,class atts
                         (?:\. )?             # optional dot-space
                         ([^\s(!]+?)          # presume this is the src
                         \s?                  # optional space
                         (?:\(((?:[^\(\)]|\([^\)]+\))+?)\))?   # optional title
                         \!                   # closing
                         (?::#{ HYPERLINK })? # optional href
                     /x
                 def inline_textile_image( text )
                     text.gsub!( IMAGE_RE )  do |m|
                         stln,algn,atts,url,title,href,href_a1,href_a2 = $~[1..8]
                         htmlesc title
                         atts = pba( atts )
                         atts = " src=\"#{ url }\"#{ atts }"
                         atts << " title=\"#{ title }\"" if title
                         atts << " alt=\"#{ title }\""
                         # size = @getimagesize($url);
                         # if($size) $atts.= " $size[3]";
                         href, alt_title = check_refs( href ) if href
                         url, url_title = check_refs( url )
                         out = ''
                         out << "<a#{ shelve( " href=\"#{ href }\"" ) }>" if href
                         out << "<img#{ shelve( atts ) } />"
                         out << "</a>#{ href_a1 }#{ href_a2 }" if href
                         if algn
                             algn = h_align( algn )
                             if stln == "<p>"
                                 out = "<p style=\"float:#{ algn }\">#{ out }"
                             else
                                 out = "#{ stln }<div style=\"float:#{ algn }\">#{ out }</div>"
                             end
                         else
                             out = stln + out
                         end
                         out
                     end
                 end
                 def shelve( val )
                     @shelf << val
                     " :redsh##{ @shelf.length }:"
                 end
                 def retrieve( text )
                     @shelf.each_with_index do |r, i|
                         text.gsub!( " :redsh##{ i + 1 }:", r )
                     end
                 end
                 def incoming_entities( text )
                     ## turn any incoming ampersands into a dummy character for now.
                     ## This uses a negative lookahead for alphanumerics followed by a semicolon,
                     ## implying an incoming html entity, to be skipped
                     text.gsub!( /&(?![#a-z0-9]+;)/i, "x%x%" )
                 end
                 def no_textile( text )
                     text.gsub!( /(^|\s)==([^=]+.*?)==(\s|$)?/,
                         '\1<notextile>\2</notextile>\3' )
                     text.gsub!( /^ *==([^=]+.*?)==/m,
                         '\1<notextile>\2</notextile>\3' )
                 end
                 def clean_white_space( text )
                     # normalize line breaks
                     text.gsub!( /\r\n/, "\n" )
                     text.gsub!( /\r/, "\n" )
                     text.gsub!( /\t/, '    ' )
                     text.gsub!( /^ +$/, '' )
                     text.gsub!( /\n{3,}/, "\n\n" )
                     text.gsub!( /"$/, "\" " )
                     # if entire document is indented, flush
                     # to the left side
                     flush_left text
                 end
                 def flush_left( text )
                     indt = 0
                     if text =~ /^ /
                         while text !~ /^ {#{indt}}\S/
                             indt += 1
                         end unless text.empty?
                         if indt.nonzero?
                             text.gsub!( /^ {#{indt}}/, '' )
                         end
                     end
                 end
                 def footnote_ref( text )
                     text.gsub!( /\b\[([0-9]+?)\](\s)?/,
                         '<sup><a href="#fn\1">\1</a></sup>\2' )
                 end
                 OFFTAGS = /(code|pre|kbd|notextile)/
                 OFFTAG_MATCH = /(?:(<\/#{ OFFTAGS }>)|(<#{ OFFTAGS }[^>]*>))(.*?)(?=<\/?#{ OFFTAGS }|\Z)/mi
                 OFFTAG_OPEN = /<#{ OFFTAGS }/
                 OFFTAG_CLOSE = /<\/?#{ OFFTAGS }/
                 HASTAG_MATCH = /(<\/?\w[^\n]*?>)/m
                 ALLTAG_MATCH = /(<\/?\w[^\n]*?>)|.*?(?=<\/?\w[^\n]*?>|$)/m
                 def glyphs_textile( text, level = 0 )
                     if text !~ HASTAG_MATCH
                         pgl text
                         footnote_ref text
                     else
                         codepre = 0
                         text.gsub!( ALLTAG_MATCH ) do |line|
                             ## matches are off if we're between <code>, <pre> etc.
                             if $1
                                 if line =~ OFFTAG_OPEN
                                     codepre += 1
                                 elsif line =~ OFFTAG_CLOSE
                                     codepre -= 1
                                     codepre = 0 if codepre < 0
                                 end
                             elsif codepre.zero?
                                 glyphs_textile( line, level + 1 )
                             else
                                 htmlesc( line, :NoQuotes )
                             end
                             # p [level, codepre, line]
                             line
                         end
                     end
                 end
                 def rip_offtags( text )
                     if text =~ /<.*>/
                         ## strip and encode <pre> content
                         codepre, used_offtags = 0, {}
                         text.gsub!( OFFTAG_MATCH ) do |line|
                             if $3
                                 offtag, aftertag = $4, $5
                                 codepre += 1
                                 used_offtags[offtag] = true
                                 if codepre - used_offtags.length > 0
                                     htmlesc( line, :NoQuotes )
                                     @pre_list.last << line
                                     line = ""
                                 else
                                     htmlesc( aftertag, :NoQuotes ) if aftertag
                                     line = "<redpre##{ @pre_list.length }>"
                                     $3.match(/<#{ OFFTAGS }([^>]*)>/)
                                     tag = $1
                                     $2.to_s.match(/(class\=\S+)/i)
                                     tag << " #{$1}" if $1
                                     @pre_list << "<#{ tag }>#{ aftertag }"
                                 end
                             elsif $1 and codepre > 0
                                 if codepre - used_offtags.length > 0
                                     htmlesc( line, :NoQuotes )
                                     @pre_list.last << line
                                     line = ""
                                 end
                                 codepre -= 1 unless codepre.zero?
                                 used_offtags = {} if codepre.zero?
                             end
                             line
                         end
                     end
                     text
                 end
                 def smooth_offtags( text )
                     unless @pre_list.empty?
                         ## replace <pre> content
                         text.gsub!( /<redpre#(\d+)>/ ) { @pre_list[$1.to_i] }
                     end
                 end
                 def inline( text )
                     [/^inline_/, /^glyphs_/].each do |meth_re|
                         @rules.each do |rule_name|
                             method( rule_name ).call( text ) if rule_name.to_s.match( meth_re )
                         end
                     end
                 end
                 def h_align( text )
                     H_ALGN_VALS[text]
                 end
                 def v_align( text )
                     V_ALGN_VALS[text]
                 end
                 def textile_popup_help( name, windowW, windowH )
                     ' <a target="_blank" href="http://hobix.com/textile/#' + helpvar + '" onclick="window.open(this.href, \'popupwindow\', \'width=' + windowW + ',height=' + windowH + ',scrollbars,resizable\'); return false;">' + name + '</a><br />'
                 end
                 # HTML cleansing stuff
                 BASIC_TAGS = {
                     'a' => ['href', 'title'],
                     'img' => ['src', 'alt', 'title'],
                     'br' => [],
                     'i' => nil,
                     'u' => nil,
                     'b' => nil,
                     'pre' => nil,
                     'kbd' => nil,
                     'code' => ['lang'],
                     'cite' => nil,
                     'strong' => nil,
                     'em' => nil,
                     'ins' => nil,
                     'sup' => nil,
                     'sub' => nil,
                     'del' => nil,
                     'table' => nil,
                     'tr' => nil,
                     'td' => ['colspan', 'rowspan'],
                     'th' => nil,
                     'ol' => nil,
                     'ul' => nil,
                     'li' => nil,
                     'p' => nil,
                     'h1' => nil,
                     'h2' => nil,
                     'h3' => nil,
                     'h4' => nil,
                     'h5' => nil,
                     'h6' => nil,
                     'blockquote' => ['cite']
                 }
                 def clean_html( text, tags = BASIC_TAGS )
                     text.gsub!( /<!\[CDATA\[/, '' )
                     text.gsub!( /<(\/*)(\w+)([^>]*)>/ ) do
                         raw = $~
                         tag = raw[2].downcase
                         if tags.has_key? tag
                             pcs = [tag]
                             tags[tag].each do |prop|
                                 ['"', "'", ''].each do |q|
                                     q2 = ( q != '' ? q : '\s' )
                                     if raw[3] =~ /#{prop}\s*=\s*#{q}([^#{q2}]+)#{q}/i
                                         attrv = $1
                                         next if prop == 'src' and attrv =~ %r{^(?!http)\w+:}
                                         pcs << "#{prop}=\"#{$1.gsub('"', '\\"')}\""
                                         break
                                     end
                                 end
                             end if tags[tag]
                             "<#{raw[1]}#{pcs.join " "}>"
                         else
                             " "
                         end
                     end
                 end
                 ALLOWED_TAGS = %w(redpre pre code notextile)
                 def escape_html_tags(text)
                   text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }
                 end
             end

test/functional/issues_controller_test.rb +10 0

             # Redmine - project management software
             # Copyright (C) 2006-2008  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.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'issues_controller'
             # Re-raise errors caught by the controller.
             class IssuesController; def rescue_action(e) raise e end; end
             class IssuesControllerTest < Test::Unit::TestCase
               fixtures :projects,
                        :users,
                        :roles,
                        :members,
                        :issues,
                        :issue_statuses,
                        :versions,
                        :trackers,
                        :projects_trackers,
                        :issue_categories,
                        :enabled_modules,
                        :enumerations,
                        :attachments,
                        :workflows,
                        :custom_fields,
                        :custom_values,
                        :custom_fields_trackers,
                        :time_entries,
                        :journals,
                        :journal_details
               def setup
                 @controller = IssuesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_nil assigns(:project)
                 assert_tag :tag => 'a', :content => /Can't print recipes/
                 assert_tag :tag => 'a', :content => /Subproject issue/
                 # private projects hidden
                 assert_no_tag :tag => 'a', :content => /Issue of a private subproject/
                 assert_no_tag :tag => 'a', :content => /Issue on project 2/
               end
               def test_index_should_not_list_issues_when_module_disabled
                 EnabledModule.delete_all("name = 'issue_tracking' AND project_id = 1")
                 get :index
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_nil assigns(:project)
                 assert_no_tag :tag => 'a', :content => /Can't print recipes/
                 assert_tag :tag => 'a', :content => /Subproject issue/
               end
               def test_index_with_project
                 Setting.display_subprojects_issues = 0
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_tag :tag => 'a', :content => /Can't print recipes/
                 assert_no_tag :tag => 'a', :content => /Subproject issue/
               end
               def test_index_with_project_and_subprojects
                 Setting.display_subprojects_issues = 1
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_tag :tag => 'a', :content => /Can't print recipes/
                 assert_tag :tag => 'a', :content => /Subproject issue/
                 assert_no_tag :tag => 'a', :content => /Issue of a private subproject/
               end
               def test_index_with_project_and_subprojects_should_show_private_subprojects
                 @request.session[:user_id] = 2
                 Setting.display_subprojects_issues = 1
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_tag :tag => 'a', :content => /Can't print recipes/
                 assert_tag :tag => 'a', :content => /Subproject issue/
                 assert_tag :tag => 'a', :content => /Issue of a private subproject/
               end
               def test_index_with_project_and_filter
                 get :index, :project_id => 1, :set_filter => 1
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
               end
               def test_index_csv_with_project
                 get :index, :format => 'csv'
                 assert_response :success
                 assert_not_nil assigns(:issues)
                 assert_equal 'text/csv', @response.content_type
                 get :index, :project_id => 1, :format => 'csv'
                 assert_response :success
                 assert_not_nil assigns(:issues)
                 assert_equal 'text/csv', @response.content_type
               end
               def test_index_pdf
                 get :index, :format => 'pdf'
                 assert_response :success
                 assert_not_nil assigns(:issues)
                 assert_equal 'application/pdf', @response.content_type
                 get :index, :project_id => 1, :format => 'pdf'
                 assert_response :success
                 assert_not_nil assigns(:issues)
                 assert_equal 'application/pdf', @response.content_type
               end
+              def test_index_sort
+                get :index, :sort_key => 'tracker'
+                assert_response :success
+                sort_params = @request.session['issuesindex_sort']
+                assert sort_params.is_a?(Hash)
+                assert_equal 'tracker', sort_params[:key]
+                assert_equal 'ASC', sort_params[:order]
+              end
               def test_gantt
                 get :gantt, :project_id => 1
                 assert_response :success
                 assert_template 'gantt.rhtml'
                 assert_not_nil assigns(:gantt)
                 events = assigns(:gantt).events
                 assert_not_nil events
                 # Issue with start and due dates
                 i = Issue.find(1)
                 assert_not_nil i.due_date
                 assert events.include?(Issue.find(1))
                 # Issue with without due date but targeted to a version with date
                 i = Issue.find(2)
                 assert_nil i.due_date
                 assert events.include?(i)
               end
               def test_cross_project_gantt
                 get :gantt
                 assert_response :success
                 assert_template 'gantt.rhtml'
                 assert_not_nil assigns(:gantt)
                 events = assigns(:gantt).events
                 assert_not_nil events
               end
               def test_gantt_export_to_pdf
                 get :gantt, :project_id => 1, :format => 'pdf'
                 assert_response :success
                 assert_template 'gantt.rfpdf'
                 assert_equal 'application/pdf', @response.content_type
                 assert_not_nil assigns(:gantt)
               end
               def test_cross_project_gantt_export_to_pdf
                 get :gantt, :format => 'pdf'
                 assert_response :success
                 assert_template 'gantt.rfpdf'
                 assert_equal 'application/pdf', @response.content_type
                 assert_not_nil assigns(:gantt)
               end
               if Object.const_defined?(:Magick)
                 def test_gantt_image
                   get :gantt, :project_id => 1, :format => 'png'
                   assert_response :success
                   assert_equal 'image/png', @response.content_type
                 end
               else
                 puts "RMagick not installed. Skipping tests !!!"
               end
               def test_calendar
                 get :calendar, :project_id => 1
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
               end
               def test_cross_project_calendar
                 get :calendar
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
               end
               def test_changes
                 get :changes, :project_id => 1
                 assert_response :success
                 assert_not_nil assigns(:journals)
                 assert_equal 'application/atom+xml', @response.content_type
               end
               def test_show_by_anonymous
                 get :show, :id => 1
                 assert_response :success
                 assert_template 'show.rhtml'
                 assert_not_nil assigns(:issue)
                 assert_equal Issue.find(1), assigns(:issue)
                 # anonymous role is allowed to add a note
                 assert_tag :tag => 'form',
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Notes/ } }
               end
               def test_show_by_manager
                 @request.session[:user_id] = 2
                 get :show, :id => 1
                 assert_response :success
                 assert_tag :tag => 'form',
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Change properties/ } },
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Log time/ } },
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Notes/ } }
               end
               def test_get_new
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1, :tracker_id => 1
                 assert_response :success
                 assert_template 'new'
                 assert_tag :tag => 'input', :attributes => { :name => 'issue[custom_field_values][2]',
                                                              :value => 'Default string' }
               end
               def test_get_new_without_tracker_id
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
                 issue = assigns(:issue)
                 assert_not_nil issue
                 assert_equal Project.find(1).trackers.first, issue.tracker
               end
               def test_update_new_form
                 @request.session[:user_id] = 2
                 xhr :post, :new, :project_id => 1,
                                  :issue => {:tracker_id => 2,
                                             :subject => 'This is the test_new issue',
                                             :description => 'This is the description',
                                             :priority_id => 5}
                 assert_response :success
                 assert_template 'new'
               end
               def test_post_new
                 @request.session[:user_id] = 2
                 post :new, :project_id => 1,
                            :issue => {:tracker_id => 3,
                                       :subject => 'This is the test_new issue',
                                       :description => 'This is the description',
                                       :priority_id => 5,
                                       :estimated_hours => '',
                                       :custom_field_values => {'2' => 'Value for field 2'}}
                 assert_redirected_to 'issues/show'
                 issue = Issue.find_by_subject('This is the test_new issue')
                 assert_not_nil issue
                 assert_equal 2, issue.author_id
                 assert_equal 3, issue.tracker_id
                 assert_nil issue.estimated_hours
                 v = issue.custom_values.find(:first, :conditions => {:custom_field_id => 2})
                 assert_not_nil v
                 assert_equal 'Value for field 2', v.value
               end
               def test_post_new_without_custom_fields_param
                 @request.session[:user_id] = 2
                 post :new, :project_id => 1,
                            :issue => {:tracker_id => 1,
                                       :subject => 'This is the test_new issue',
                                       :description => 'This is the description',
                                       :priority_id => 5}
                 assert_redirected_to 'issues/show'
               end
               def test_post_new_with_required_custom_field_and_without_custom_fields_param
                 field = IssueCustomField.find_by_name('Database')
                 field.update_attribute(:is_required, true)
                 @request.session[:user_id] = 2
                 post :new, :project_id => 1,
                            :issue => {:tracker_id => 1,
                                       :subject => 'This is the test_new issue',
                                       :description => 'This is the description',
                                       :priority_id => 5}
                 assert_response :success
                 assert_template 'new'
                 issue = assigns(:issue)
                 assert_not_nil issue
                 assert_equal 'activerecord_error_invalid', issue.errors.on(:custom_values)
               end
               def test_post_should_preserve_fields_values_on_validation_failure
                 @request.session[:user_id] = 2
                 post :new, :project_id => 1,
                            :issue => {:tracker_id => 1,
                                       :subject => 'This is the test_new issue',
                                       # empty description
                                       :description => '',
                                       :priority_id => 6,
                                       :custom_field_values => {'1' => 'Oracle', '2' => 'Value for field 2'}}
                 assert_response :success
                 assert_template 'new'
                 assert_tag :input, :attributes => { :name => 'issue[subject]',
                                                     :value => 'This is the test_new issue' }
                 assert_tag :select, :attributes => { :name => 'issue[priority_id]' },
                                     :child => { :tag => 'option', :attributes => { :selected => 'selected',
                                                                                    :value => '6' },
                                                                   :content => 'High' }
                 # Custom fields
                 assert_tag :select, :attributes => { :name => 'issue[custom_field_values][1]' },
                                     :child => { :tag => 'option', :attributes => { :selected => 'selected',
                                                                                    :value => 'Oracle' },
                                                                   :content => 'Oracle' }
                 assert_tag :input, :attributes => { :name => 'issue[custom_field_values][2]',
                                                     :value => 'Value for field 2'}
               end
               def test_copy_issue
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1, :copy_from => 1
                 assert_template 'new'
                 assert_not_nil assigns(:issue)
                 orig = Issue.find(1)
                 assert_equal orig.subject, assigns(:issue).subject
               end
               def test_get_edit
                 @request.session[:user_id] = 2
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 assert_not_nil assigns(:issue)
                 assert_equal Issue.find(1), assigns(:issue)
               end
               def test_get_edit_with_params
                 @request.session[:user_id] = 2
                 get :edit, :id => 1, :issue => { :status_id => 5, :priority_id => 7 }
                 assert_response :success
                 assert_template 'edit'
                 issue = assigns(:issue)
                 assert_not_nil issue
                 assert_equal 5, issue.status_id
                 assert_tag :select, :attributes => { :name => 'issue[status_id]' },
                                     :child => { :tag => 'option',
                                                 :content => 'Closed',
                                                 :attributes => { :selected => 'selected' } }
                 assert_equal 7, issue.priority_id
                 assert_tag :select, :attributes => { :name => 'issue[priority_id]' },
                                     :child => { :tag => 'option',
                                                 :content => 'Urgent',
                                                 :attributes => { :selected => 'selected' } }
               end
               def test_reply_to_issue
                 @request.session[:user_id] = 2
                 get :reply, :id => 1
                 assert_response :success
                 assert_select_rjs :show, "update"
               end
               def test_reply_to_note
                 @request.session[:user_id] = 2
                 get :reply, :id => 1, :journal_id => 2
                 assert_response :success
                 assert_select_rjs :show, "update"
               end
               def test_post_edit_without_custom_fields_param
                 @request.session[:user_id] = 2
                 ActionMailer::Base.deliveries.clear
                 issue = Issue.find(1)
                 assert_equal '125', issue.custom_value_for(2).value
                 old_subject = issue.subject
                 new_subject = 'Subject modified by IssuesControllerTest#test_post_edit'
                 assert_difference('Journal.count') do
                   assert_difference('JournalDetail.count', 2) do
                     post :edit, :id => 1, :issue => {:subject => new_subject,
                                                      :priority_id => '6',
                                                      :category_id => '1' # no change
                                                     }
                   end
                 end
                 assert_redirected_to 'issues/show/1'
                 issue.reload
                 assert_equal new_subject, issue.subject
                 # Make sure custom fields were not cleared
                 assert_equal '125', issue.custom_value_for(2).value
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")
                 assert mail.body.include?("Subject changed from #{old_subject} to #{new_subject}")
               end
               def test_post_edit_with_custom_field_change
                 @request.session[:user_id] = 2
                 issue = Issue.find(1)
                 assert_equal '125', issue.custom_value_for(2).value
                 assert_difference('Journal.count') do
                   assert_difference('JournalDetail.count', 3) do
                     post :edit, :id => 1, :issue => {:subject => 'Custom field change',
                                                      :priority_id => '6',
                                                      :category_id => '1', # no change
                                                      :custom_field_values => { '2' => 'New custom value' }
                                                     }
                   end
                 end
                 assert_redirected_to 'issues/show/1'
                 issue.reload
                 assert_equal 'New custom value', issue.custom_value_for(2).value
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 assert mail.body.include?("Searchable field changed from 125 to New custom value")
               end
               def test_post_edit_with_status_and_assignee_change
                 issue = Issue.find(1)
                 assert_equal 1, issue.status_id
                 @request.session[:user_id] = 2
                 assert_difference('TimeEntry.count', 0) do
                   post :edit,
                        :id => 1,
                        :issue => { :status_id => 2, :assigned_to_id => 3 },
                        :notes => 'Assigned to dlopper',
                        :time_entry => { :hours => '', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
                 end
                 assert_redirected_to 'issues/show/1'
                 issue.reload
                 assert_equal 2, issue.status_id
                 j = issue.journals.find(:first, :order => 'id DESC')
                 assert_equal 'Assigned to dlopper', j.notes
                 assert_equal 2, j.details.size
                 mail = ActionMailer::Base.deliveries.last
                 assert mail.body.include?("Status changed from New to Assigned")
               end
               def test_post_edit_with_note_only
                 notes = 'Note added by IssuesControllerTest#test_update_with_note_only'
                 # anonymous user
                 post :edit,
                      :id => 1,
                      :notes => notes
                 assert_redirected_to 'issues/show/1'
                 j = Issue.find(1).journals.find(:first, :order => 'id DESC')
                 assert_equal notes, j.notes
                 assert_equal 0, j.details.size
                 assert_equal User.anonymous, j.user
                 mail = ActionMailer::Base.deliveries.last
                 assert mail.body.include?(notes)
               end
               def test_post_edit_with_note_and_spent_time
                 @request.session[:user_id] = 2
                 spent_hours_before = Issue.find(1).spent_hours
                 assert_difference('TimeEntry.count') do
                   post :edit,
                        :id => 1,
                        :notes => '2.5 hours added',
                        :time_entry => { :hours => '2.5', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
                 end
                 assert_redirected_to 'issues/show/1'
                 issue = Issue.find(1)
                 j = issue.journals.find(:first, :order => 'id DESC')
                 assert_equal '2.5 hours added', j.notes
                 assert_equal 0, j.details.size
                 t = issue.time_entries.find(:first, :order => 'id DESC')
                 assert_not_nil t
                 assert_equal 2.5, t.hours
                 assert_equal spent_hours_before + 2.5, issue.spent_hours
               end
               def test_post_edit_with_attachment_only
                 set_tmp_attachments_directory
                 # Delete all fixtured journals, a race condition can occur causing the wrong
                 # journal to get fetched in the next find.
                 Journal.delete_all
                 # anonymous user
                 post :edit,
                      :id => 1,
                      :notes => '',
                      :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
                 assert_redirected_to 'issues/show/1'
                 j = Issue.find(1).journals.find(:first, :order => 'id DESC')
                 assert j.notes.blank?
                 assert_equal 1, j.details.size
                 assert_equal 'testfile.txt', j.details.first.value
                 assert_equal User.anonymous, j.user
                 mail = ActionMailer::Base.deliveries.last
                 assert mail.body.include?('testfile.txt')
               end
               def test_post_edit_with_no_change
                 issue = Issue.find(1)
                 issue.journals.clear
                 ActionMailer::Base.deliveries.clear
                 post :edit,
                      :id => 1,
                      :notes => ''
                 assert_redirected_to 'issues/show/1'
                 issue.reload
                 assert issue.journals.empty?
                 # No email should be sent
                 assert ActionMailer::Base.deliveries.empty?
               end
               def test_bulk_edit
                 @request.session[:user_id] = 2
                 # update issues priority
                 post :bulk_edit, :ids => [1, 2], :priority_id => 7, :notes => 'Bulk editing', :assigned_to_id => ''
                 assert_response 302
                 # check that the issues were updated
                 assert_equal [7, 7], Issue.find_all_by_id([1, 2]).collect {|i| i.priority.id}
                 assert_equal 'Bulk editing', Issue.find(1).journals.find(:first, :order => 'created_on DESC').notes
               end
               def test_bulk_unassign
                 assert_not_nil Issue.find(2).assigned_to
                 @request.session[:user_id] = 2
                 # unassign issues
                 post :bulk_edit, :ids => [1, 2], :notes => 'Bulk unassigning', :assigned_to_id => 'none'
                 assert_response 302
                 # check that the issues were updated
                 assert_nil Issue.find(2).assigned_to
               end
               def test_move_one_issue_to_another_project
                 @request.session[:user_id] = 1
                 post :move, :id => 1, :new_project_id => 2
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert_equal 2, Issue.find(1).project_id
               end
               def test_bulk_move_to_another_project
                 @request.session[:user_id] = 1
                 post :move, :ids => [1, 2], :new_project_id => 2
                 assert_redirected_to 'projects/ecookbook/issues'
                 # Issues moved to project 2
                 assert_equal 2, Issue.find(1).project_id
                 assert_equal 2, Issue.find(2).project_id
                 # No tracker change
                 assert_equal 1, Issue.find(1).tracker_id
                 assert_equal 2, Issue.find(2).tracker_id
               end
               def test_bulk_move_to_another_tracker
                 @request.session[:user_id] = 1
                 post :move, :ids => [1, 2], :new_tracker_id => 2
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert_equal 2, Issue.find(1).tracker_id
                 assert_equal 2, Issue.find(2).tracker_id
               end
               def test_context_menu_one_issue
                 @request.session[:user_id] = 2
                 get :context_menu, :ids => [1]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Edit',
                                         :attributes => { :href => '/issues/edit/1',
                                                          :class => 'icon-edit' }
                 assert_tag :tag => 'a', :content => 'Closed',
                                         :attributes => { :href => '/issues/edit/1?issue%5Bstatus_id%5D=5',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Immediate',
                                         :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;priority_id=8',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Dave Lopper',
                                         :attributes => { :href => '/issues/bulk_edit?assigned_to_id=3&amp;ids%5B%5D=1',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Copy',
                                         :attributes => { :href => '/projects/ecookbook/issues/new?copy_from=1',
                                                          :class => 'icon-copy' }
                 assert_tag :tag => 'a', :content => 'Move',
                                         :attributes => { :href => '/issues/move?ids%5B%5D=1',
                                                          :class => 'icon-move' }
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '/issues/destroy?ids%5B%5D=1',
                                                          :class => 'icon-del' }
               end
               def test_context_menu_one_issue_by_anonymous
                 get :context_menu, :ids => [1]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '#',
                                                          :class => 'icon-del disabled' }
               end
               def test_context_menu_multiple_issues_of_same_project
                 @request.session[:user_id] = 2
                 get :context_menu, :ids => [1, 2]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Edit',
                                         :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;ids%5B%5D=2',
                                                          :class => 'icon-edit' }
                 assert_tag :tag => 'a', :content => 'Immediate',
                                         :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;ids%5B%5D=2&amp;priority_id=8',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Dave Lopper',
                                         :attributes => { :href => '/issues/bulk_edit?assigned_to_id=3&amp;ids%5B%5D=1&amp;ids%5B%5D=2',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Move',
                                         :attributes => { :href => '/issues/move?ids%5B%5D=1&amp;ids%5B%5D=2',
                                                          :class => 'icon-move' }
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '/issues/destroy?ids%5B%5D=1&amp;ids%5B%5D=2',
                                                          :class => 'icon-del' }
               end
               def test_context_menu_multiple_issues_of_different_project
                 @request.session[:user_id] = 2
                 get :context_menu, :ids => [1, 2, 4]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '#',
                                                          :class => 'icon-del disabled' }
               end
               def test_destroy_issue_with_no_time_entries
                 assert_nil TimeEntry.find_by_issue_id(2)
                 @request.session[:user_id] = 2
                 post :destroy, :id => 2
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert_nil Issue.find_by_id(2)
               end
               def test_destroy_issues_with_time_entries
                 @request.session[:user_id] = 2
                 post :destroy, :ids => [1, 3]
                 assert_response :success
                 assert_template 'destroy'
                 assert_not_nil assigns(:hours)
                 assert Issue.find_by_id(1) && Issue.find_by_id(3)
               end
               def test_destroy_issues_and_destroy_time_entries
                 @request.session[:user_id] = 2
                 post :destroy, :ids => [1, 3], :todo => 'destroy'
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert !(Issue.find_by_id(1) || Issue.find_by_id(3))
                 assert_nil TimeEntry.find_by_id([1, 2])
               end
               def test_destroy_issues_and_assign_time_entries_to_project
                 @request.session[:user_id] = 2
                 post :destroy, :ids => [1, 3], :todo => 'nullify'
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert !(Issue.find_by_id(1) || Issue.find_by_id(3))
                 assert_nil TimeEntry.find(1).issue_id
                 assert_nil TimeEntry.find(2).issue_id
               end
               def test_destroy_issues_and_reassign_time_entries_to_another_issue
                 @request.session[:user_id] = 2
                 post :destroy, :ids => [1, 3], :todo => 'reassign', :reassign_to_id => 2
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert !(Issue.find_by_id(1) || Issue.find_by_id(3))
                 assert_equal 2, TimeEntry.find(1).issue_id
                 assert_equal 2, TimeEntry.find(2).issue_id
               end
               def test_destroy_attachment
                 issue = Issue.find(3)
                 a = issue.attachments.size
                 @request.session[:user_id] = 2
                 post :destroy_attachment, :id => 3, :attachment_id => 1
                 assert_redirected_to 'issues/show/3'
                 assert_nil Attachment.find_by_id(1)
                 issue.reload
                 assert_equal((a-1), issue.attachments.size)
                 j = issue.journals.find(:first, :order => 'created_on DESC')
                 assert_equal 'attachment', j.details.first.property
               end
             end

test/unit/helpers/application_helper_test.rb +10 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.
             require File.dirname(__FILE__) + '/../../test_helper'
             class ApplicationHelperTest < HelperTestCase
               include ApplicationHelper
               include ActionView::Helpers::TextHelper
               fixtures :projects, :roles, :enabled_modules, :users,
                                   :repositories, :changesets,
                                   :trackers, :issue_statuses, :issues, :versions, :documents,
                                   :wikis, :wiki_pages, :wiki_contents,
                                   :boards, :messages,
                                   :attachments
               def setup
                 super
               end
               def test_auto_links
                 to_test = {
                   'http://foo.bar' => '<a class="external" href="http://foo.bar">http://foo.bar</a>',
                   'http://foo.bar/~user' => '<a class="external" href="http://foo.bar/~user">http://foo.bar/~user</a>',
                   'http://foo.bar.' => '<a class="external" href="http://foo.bar">http://foo.bar</a>.',
                   'https://foo.bar.' => '<a class="external" href="https://foo.bar">https://foo.bar</a>.',
                   'This is a link: http://foo.bar.' => 'This is a link: <a class="external" href="http://foo.bar">http://foo.bar</a>.',
                   'A link (eg. http://foo.bar).' => 'A link (eg. <a class="external" href="http://foo.bar">http://foo.bar</a>).',
                   'http://foo.bar/foo.bar#foo.bar.' => '<a class="external" href="http://foo.bar/foo.bar#foo.bar">http://foo.bar/foo.bar#foo.bar</a>.',
                   'http://www.foo.bar/Test_(foobar)' => '<a class="external" href="http://www.foo.bar/Test_(foobar)">http://www.foo.bar/Test_(foobar)</a>',
                   '(see inline link : http://www.foo.bar/Test_(foobar))' => '(see inline link : <a class="external" href="http://www.foo.bar/Test_(foobar)">http://www.foo.bar/Test_(foobar)</a>)',
                   '(see inline link : http://www.foo.bar/Test)' => '(see inline link : <a class="external" href="http://www.foo.bar/Test">http://www.foo.bar/Test</a>)',
                   '(see inline link : http://www.foo.bar/Test).' => '(see inline link : <a class="external" href="http://www.foo.bar/Test">http://www.foo.bar/Test</a>).',
                   '(see "inline link":http://www.foo.bar/Test_(foobar))' => '(see <a href="http://www.foo.bar/Test_(foobar)" class="external">inline link</a>)',
                   '(see "inline link":http://www.foo.bar/Test)' => '(see <a href="http://www.foo.bar/Test" class="external">inline link</a>)',
                   '(see "inline link":http://www.foo.bar/Test).' => '(see <a href="http://www.foo.bar/Test" class="external">inline link</a>).',
                   'www.foo.bar' => '<a class="external" href="http://www.foo.bar">www.foo.bar</a>',
                   'http://foo.bar/page?p=1&t=z&s=' => '<a class="external" href="http://foo.bar/page?p=1&#38;t=z&#38;s=">http://foo.bar/page?p=1&#38;t=z&#38;s=</a>',
                   'http://foo.bar/page#125' => '<a class="external" href="http://foo.bar/page#125">http://foo.bar/page#125</a>',
                   'http://foo@www.bar.com' => '<a class="external" href="http://foo@www.bar.com">http://foo@www.bar.com</a>',
                   'http://foo:bar@www.bar.com' => '<a class="external" href="http://foo:bar@www.bar.com">http://foo:bar@www.bar.com</a>',
                   'ftp://foo.bar' => '<a class="external" href="ftp://foo.bar">ftp://foo.bar</a>',
                   'ftps://foo.bar' => '<a class="external" href="ftps://foo.bar">ftps://foo.bar</a>',
                   'sftp://foo.bar' => '<a class="external" href="sftp://foo.bar">sftp://foo.bar</a>',
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_auto_mailto
                 assert_equal '<p><a href="mailto:test@foo.bar" class="email">test@foo.bar</a></p>',
                   textilizable('test@foo.bar')
               end
               def test_inline_images
                 to_test = {
                   '!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />',
                   'floating !>http://foo.bar/image.jpg!' => 'floating <div style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></div>',
                   'with class !(some-class)http://foo.bar/image.jpg!' => 'with class <img src="http://foo.bar/image.jpg" class="some-class" alt="" />',
                   'with style !{width:100px;height100px}http://foo.bar/image.jpg!' => 'with style <img src="http://foo.bar/image.jpg" style="width:100px;height100px;" alt="" />',
                   'with title !http://foo.bar/image.jpg(This is a title)!' => 'with title <img src="http://foo.bar/image.jpg" title="This is a title" alt="This is a title" />',
                   'with title !http://foo.bar/image.jpg(This is a double-quoted "title")!' => 'with title <img src="http://foo.bar/image.jpg" title="This is a double-quoted &quot;title&quot;" alt="This is a double-quoted &quot;title&quot;" />',
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
+              def test_acronyms
+                to_test = {
+                  'this is an acronym: GPL(General Public License)' => 'this is an acronym: <acronym title="General Public License">GPL</acronym>',
+                  'GPL(This is a double-quoted "title")' => '<acronym title="This is a double-quoted &quot;title&quot;">GPL</acronym>',
+                }
+                to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
+              end
               def test_attached_images
                 to_test = {
                   'Inline image: !logo.gif!' => 'Inline image: <img src="/attachments/download/3" title="This is a logo" alt="This is a logo" />',
                   'Inline image: !logo.GIF!' => 'Inline image: <img src="/attachments/download/3" title="This is a logo" alt="This is a logo" />'
                 }
                 attachments = Attachment.find(:all)
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text, :attachments => attachments) }
               end
               def test_textile_external_links
                 to_test = {
                   'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
                   'This is an intern "link":/foo/bar' => 'This is an intern <a href="/foo/bar">link</a>',
                   '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>',
+                  '"link (Link title with "double-quotes")":http://foo.bar' => '<a href="http://foo.bar" title="Link title with &quot;double-quotes&quot;" class="external">link</a>',
                   "This is not a \"Link\":\n\nAnother paragraph" => "This is not a \"Link\":</p>\n\n\n\t<p>Another paragraph",
                   # no multiline link text
                   "This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />\nand another on a second line\":test"
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_redmine_links
                 issue_link = link_to('#3', {:controller => 'issues', :action => 'show', :id => 3},
                                            :class => 'issue', :title => 'Error 281 when updating a recipe (New)')
                 changeset_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
                                                :class => 'changeset', :title => 'My very first commit')
                 document_link = link_to('Test document', {:controller => 'documents', :action => 'show', :id => 1},
                                                          :class => 'document')
                 version_link = link_to('1.0', {:controller => 'versions', :action => 'show', :id => 2},
                                               :class => 'version')
                 message_url = {:controller => 'messages', :action => 'show', :board_id => 1, :id => 4}
                 source_url = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file']}
                 source_url_with_ext = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file.ext']}
                 to_test = {
                   # tickets
                   '#3, #3 and #3.'              => "#{issue_link}, #{issue_link} and #{issue_link}.",
                   # changesets
                   'r1'                          => changeset_link,
                   # documents
                   'document#1'                  => document_link,
                   'document:"Test document"'    => document_link,
                   # versions
                   'version#2'                   => version_link,
                   'version:1.0'                 => version_link,
                   'version:"1.0"'               => version_link,
                   # source
                   'source:/some/file'           => link_to('source:/some/file', source_url, :class => 'source'),
                   'source:/some/file.'          => link_to('source:/some/file', source_url, :class => 'source') + ".",
                   'source:/some/file.ext.'      => link_to('source:/some/file.ext', source_url_with_ext, :class => 'source') + ".",
                   'source:/some/file. '         => link_to('source:/some/file', source_url, :class => 'source') + ".",
                   'source:/some/file.ext. '     => link_to('source:/some/file.ext', source_url_with_ext, :class => 'source') + ".",
                   'source:/some/file, '         => link_to('source:/some/file', source_url, :class => 'source') + ",",
                   'source:/some/file@52'        => link_to('source:/some/file@52', source_url.merge(:rev => 52), :class => 'source'),
                   'source:/some/file.ext@52'    => link_to('source:/some/file.ext@52', source_url_with_ext.merge(:rev => 52), :class => 'source'),
                   'source:/some/file#L110'      => link_to('source:/some/file#L110', source_url.merge(:anchor => 'L110'), :class => 'source'),
                   'source:/some/file.ext#L110'  => link_to('source:/some/file.ext#L110', source_url_with_ext.merge(:anchor => 'L110'), :class => 'source'),
                   'source:/some/file@52#L110'   => link_to('source:/some/file@52#L110', source_url.merge(:rev => 52, :anchor => 'L110'), :class => 'source'),
                   'export:/some/file'           => link_to('export:/some/file', source_url.merge(:format => 'raw'), :class => 'source download'),
                   # message
                   'message#4'                   => link_to('Post 2', message_url, :class => 'message'),
                   'message#5'                   => link_to('RE: post 2', message_url.merge(:anchor => 'message-5'), :class => 'message'),
                   # escaping
                   '!#3.'                        => '#3.',
                   '!r1'                         => 'r1',
                   '!document#1'                 => 'document#1',
                   '!document:"Test document"'   => 'document:"Test document"',
                   '!version#2'                  => 'version#2',
                   '!version:1.0'                => 'version:1.0',
                   '!version:"1.0"'              => 'version:"1.0"',
                   '!source:/some/file'          => 'source:/some/file',
                   # invalid expressions
                   'source:'                     => 'source:',
                   # url hash
                   "http://foo.bar/FAQ#3"       => '<a class="external" href="http://foo.bar/FAQ#3">http://foo.bar/FAQ#3</a>',
                 }
                 @project = Project.find(1)
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_wiki_links
                 to_test = {
                   '[[CookBook documentation]]' => '<a href="/wiki/ecookbook/CookBook_documentation" class="wiki-page">CookBook documentation</a>',
                   '[[Another page|Page]]' => '<a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a>',
                   # link with anchor
                   '[[CookBook documentation#One-section]]' => '<a href="/wiki/ecookbook/CookBook_documentation#One-section" class="wiki-page">CookBook documentation</a>',
                   '[[Another page#anchor|Page]]' => '<a href="/wiki/ecookbook/Another_page#anchor" class="wiki-page">Page</a>',
                   # page that doesn't exist
                   '[[Unknown page]]' => '<a href="/wiki/ecookbook/Unknown_page" class="wiki-page new">Unknown page</a>',
                   '[[Unknown page|404]]' => '<a href="/wiki/ecookbook/Unknown_page" class="wiki-page new">404</a>',
                   # link to another project wiki
                   '[[onlinestore:]]' => '<a href="/wiki/onlinestore/" class="wiki-page">onlinestore</a>',
                   '[[onlinestore:|Wiki]]' => '<a href="/wiki/onlinestore/" class="wiki-page">Wiki</a>',
                   '[[onlinestore:Start page]]' => '<a href="/wiki/onlinestore/Start_page" class="wiki-page">Start page</a>',
                   '[[onlinestore:Start page|Text]]' => '<a href="/wiki/onlinestore/Start_page" class="wiki-page">Text</a>',
                   '[[onlinestore:Unknown page]]' => '<a href="/wiki/onlinestore/Unknown_page" class="wiki-page new">Unknown page</a>',
                   # striked through link
                   '-[[Another page|Page]]-' => '<del><a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a></del>',
                   '-[[Another page|Page]] link-' => '<del><a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a> link</del>',
                   # escaping
                   '![[Another page|Page]]' => '[[Another page|Page]]',
                 }
                 @project = Project.find(1)
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_html_tags
                 to_test = {
                   "<div>content</div>" => "<p>&lt;div&gt;content&lt;/div&gt;</p>",
                   "<div class=\"bold\">content</div>" => "<p>&lt;div class=\"bold\"&gt;content&lt;/div&gt;</p>",
                   "<script>some script;</script>" => "<p>&lt;script&gt;some script;&lt;/script&gt;</p>",
                   # do not escape pre/code tags
                   "<pre>\nline 1\nline2</pre>" => "<pre>\nline 1\nline2</pre>",
                   "<pre><code>\nline 1\nline2</code></pre>" => "<pre><code>\nline 1\nline2</code></pre>",
                   "<pre><div>content</div></pre>" => "<pre>&lt;div&gt;content&lt;/div&gt;</pre>",
                   "HTML comment: <!-- no comments -->" => "<p>HTML comment: &lt;!-- no comments --&gt;</p>",
                   "<!-- opening comment" => "<p>&lt;!-- opening comment</p>",
                   # remove attributes except class
                   "<pre class='foo'>some text</pre>" => "<pre class='foo'>some text</pre>",
                   "<pre onmouseover='alert(1)'>some text</pre>" => "<pre>some text</pre>",
                 }
                 to_test.each { |text, result| assert_equal result, textilizable(text) }
               end
               def test_allowed_html_tags
                 to_test = {
                   "<pre>preformatted text</pre>" => "<pre>preformatted text</pre>",
                   "<notextile>no *textile* formatting</notextile>" => "no *textile* formatting",
                   "<notextile>this is <tag>a tag</tag></notextile>" => "this is &lt;tag&gt;a tag&lt;/tag&gt;"
                 }
                 to_test.each { |text, result| assert_equal result, textilizable(text) }
               end
               def syntax_highlight
                 raw = <<-RAW
             <pre><code class="ruby">
             # Some ruby code here
             </pre></code>
             RAW
                 expected = <<-EXPECTED
             <pre><code class="ruby CodeRay"><span class="no">1</span> <span class="c"># Some ruby code here</span>
             </pre></code>
             EXPECTED
                 assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
               end
               def test_wiki_links_in_tables
                 to_test = {"|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|" =>
                              '<tr><td><a href="/wiki/ecookbook/Page" class="wiki-page new">Link title</a></td>' +
                              '<td><a href="/wiki/ecookbook/Other_Page" class="wiki-page new">Other title</a></td>' +
                              '</tr><tr><td>Cell 21</td><td><a href="/wiki/ecookbook/Last_page" class="wiki-page new">Last page</a></td></tr>'
                 }
                 @project = Project.find(1)
                 to_test.each { |text, result| assert_equal "<table>#{result}</table>", textilizable(text).gsub(/[\t\n]/, '') }
               end
               def test_text_formatting
                 to_test = {'*_+bold, italic and underline+_*' => '<strong><em><ins>bold, italic and underline</ins></em></strong>',
                            '(_text within parentheses_)' => '(<em>text within parentheses</em>)'
                           }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_wiki_horizontal_rule
                 assert_equal '<hr />', textilizable('---')
                 assert_equal '<p>Dashes: ---</p>', textilizable('Dashes: ---')
               end
               def test_acronym
                 assert_equal '<p>This is an acronym: <acronym title="American Civil Liberties Union">ACLU</acronym>.</p>',
                              textilizable('This is an acronym: ACLU(American Civil Liberties Union).')
               end
               def test_footnotes
                 raw = <<-RAW
             This is some text[1].
             fn1. This is the foot note
             RAW
                 expected = <<-EXPECTED
             <p>This is some text<sup><a href=\"#fn1\">1</a></sup>.</p>
             <p id="fn1" class="footnote"><sup>1</sup> This is the foot note</p>
             EXPECTED
                 assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
               end
               def test_table_of_content
                 raw = <<-RAW
             {{toc}}
             h1. Title
             Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
             h2. Subtitle
             Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
             h2. Subtitle with %{color:red}red text%
             h1. Another title
             RAW
                 expected = '<ul class="toc">' +
                            '<li class="heading1"><a href="#Title">Title</a></li>' +
                            '<li class="heading2"><a href="#Subtitle">Subtitle</a></li>' +
                            '<li class="heading2"><a href="#Subtitle-with-red-text">Subtitle with red text</a></li>' +
                            '<li class="heading1"><a href="#Another-title">Another title</a></li>' +
                            '</ul>'
                 assert textilizable(raw).gsub("\n", "").include?(expected)
               end
               def test_blockquote
                 # orig raw text
                 raw = <<-RAW
             John said:
             > Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
             > Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
             > * Donec odio lorem,
             > * sagittis ac,
             > * malesuada in,
             > * adipiscing eu, dolor.
             >
             > >Nulla varius pulvinar diam. Proin id arcu id lorem scelerisque condimentum. Proin vehicula turpis vitae lacus.
             > Proin a tellus. Nam vel neque.
             He's right.
             RAW
                 # expected html
                 expected = <<-EXPECTED
             <p>John said:</p>
             <blockquote>
             Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
             Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
             <ul>
               <li>Donec odio lorem,</li>
               <li>sagittis ac,</li>
               <li>malesuada in,</li>
               <li>adipiscing eu, dolor.</li>
             </ul>
             <blockquote>
             <p>Nulla varius pulvinar diam. Proin id arcu id lorem scelerisque condimentum. Proin vehicula turpis vitae lacus.</p>
             </blockquote>
             <p>Proin a tellus. Nam vel neque.</p>
             </blockquote>
             <p>He's right.</p>
             EXPECTED
                 assert_equal expected.gsub(%r{\s+}, ''), textilizable(raw).gsub(%r{\s+}, '')
               end
               def test_table
                 raw = <<-RAW
             This is a table with empty cells:
             |cell11|cell12||
             |cell21||cell23|
             |cell31|cell32|cell33|
             RAW
                 expected = <<-EXPECTED
             <p>This is a table with empty cells:</p>
             <table>
               <tr><td>cell11</td><td>cell12</td><td></td></tr>
               <tr><td>cell21</td><td></td><td>cell23</td></tr>
               <tr><td>cell31</td><td>cell32</td><td>cell33</td></tr>
             </table>
             EXPECTED
                 assert_equal expected.gsub(%r{\s+}, ''), textilizable(raw).gsub(%r{\s+}, '')
               end
               def test_default_formatter
                 Setting.text_formatting = 'unknown'
                 text = 'a *link*: http://www.example.net/'
                 assert_equal '<p>a *link*: <a href="http://www.example.net/">http://www.example.net/</a></p>', textilizable(text)
                 Setting.text_formatting = 'textile'
               end
               def test_date_format_default
                 today = Date.today
                 Setting.date_format = ''
                 assert_equal l_date(today), format_date(today)
               end
               def test_date_format
                 today = Date.today
                 Setting.date_format = '%d %m %Y'
                 assert_equal today.strftime('%d %m %Y'), format_date(today)
               end
               def test_time_format_default
                 now = Time.now
                 Setting.date_format = ''
                 Setting.time_format = ''
                 assert_equal l_datetime(now), format_time(now)
                 assert_equal l_time(now), format_time(now, false)
               end
               def test_time_format
                 now = Time.now
                 Setting.date_format = '%d %m %Y'
                 Setting.time_format = '%H %M'
                 assert_equal now.strftime('%d %m %Y %H %M'), format_time(now)
                 assert_equal now.strftime('%H %M'), format_time(now, false)
               end
               def test_utc_time_format
                 now = Time.now.utc
                 Setting.date_format = '%d %m %Y'
                 Setting.time_format = '%H %M'
                 assert_equal Time.now.strftime('%d %m %Y %H %M'), format_time(now)
                 assert_equal Time.now.strftime('%H %M'), format_time(now, false)
               end
               def test_due_date_distance_in_words
                 to_test = { Date.today => 'Due in 0 days',
                             Date.today + 1 => 'Due in 1 day',
                             Date.today + 100 => 'Due in 100 days',
                             Date.today + 20000 => 'Due in 20000 days',
                             Date.today - 1 => '1 day late',
                             Date.today - 100 => '100 days late',
                             Date.today - 20000 => '20000 days late',
                            }
                 to_test.each do |date, expected|
                   assert_equal expected, due_date_distance_in_words(date)
                 end
               end
               def test_avatar
                 # turn on avatars
                 Setting.gravatar_enabled = '1'
                 assert avatar(User.find_by_mail('jsmith@somenet.foo')).include?(Digest::MD5.hexdigest('jsmith@somenet.foo'))
                 assert avatar('jsmith <jsmith@somenet.foo>').include?(Digest::MD5.hexdigest('jsmith@somenet.foo'))
                 assert_nil avatar('jsmith')
                 assert_nil avatar(nil)
                 # turn off avatars
                 Setting.gravatar_enabled = '0'
                 assert_nil avatar(User.find_by_mail('jsmith@somenet.foo'))
               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