jro_apps/redmine Commit - r2462:589320337db0

Trackers controller refactoring....

Jean-Philippe Lang -

r2462:589320337db0

parent child

Context file:

r2462:589320337db0

Collapse all files

app/controllers/trackers_controller.rb +4 -20

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006  Jean-Philippe Lang
+            # Copyright (C) 2006-2009  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 TrackersController < ApplicationController
               before_filter :require_admin
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
-              # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
+              verify :method => :post, :only => :destroy, :redirect_to => { :action => :list }
-              verify :method => :post, :only => [ :destroy, :move ], :redirect_to => { :action => :list }
               def list
                 @tracker_pages, @trackers = paginate :trackers, :per_page => 10, :order => 'position'
                 render :action => "list", :layout => false if request.xhr?
               end
               def new
                 @tracker = Tracker.new(params[:tracker])
                 if request.post? and @tracker.save
                   # workflow copy
                   if !params[:copy_workflow_from].blank? && (copy_from = Tracker.find_by_id(params[:copy_workflow_from]))
                     @tracker.workflows.copy(copy_from)
                   end
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                   return
                 end
                 @trackers = Tracker.find :all, :order => 'position'
                 @projects = Project.find(:all)
               end
               def edit
                 @tracker = Tracker.find(params[:id])
                 if request.post? and @tracker.update_attributes(params[:tracker])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                   return
                 end
                 @projects = Project.find(:all)
               end
-              def move
-                @tracker = Tracker.find(params[:id])
-                case params[:position]
-                when 'highest'
-                  @tracker.move_to_top
-                when 'higher'
-                  @tracker.move_higher
-                when 'lower'
-                  @tracker.move_lower
-                when 'lowest'
-                  @tracker.move_to_bottom
-                end if params[:position]
-                redirect_to :action => 'list'
-              end
               def destroy
                 @tracker = Tracker.find(params[:id])
                 unless @tracker.issues.empty?
                   flash[:error] = "This tracker contains issues and can\'t be deleted."
                 else
                   @tracker.destroy
                 end
                 redirect_to :action => 'list'
               end
             end

app/helpers/application_helper.rb +7 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 'coderay'
             require 'coderay/helpers/file_type'
             require 'forwardable'
             require 'cgi'
             module ApplicationHelper
               include Redmine::WikiFormatting::Macros::Definitions
               include Redmine::I18n
               include GravatarHelper::PublicMethods
               extend Forwardable
               def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
               def current_role
                 @current_role ||= User.current.role_for_project(@project)
               end
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 User.current.allowed_to?({:controller => controller, :action => action}, @project)
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
               end
               # Display a link to remote if user is authorized
               def link_to_remote_if_authorized(name, options = {}, html_options = nil)
                 url = options[:url] || {}
                 link_to_remote(name, options, html_options) if authorize_for(url[:controller] || params[:controller], url[:action])
               end
               # Display a link to user's account page
               def link_to_user(user, options={})
                 (user && !user.anonymous?) ? link_to(user.name(options[:format]), :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
               end
               def link_to_issue(issue, options={})
                 options[:class] ||= ''
                 options[:class] << ' issue'
                 options[:class] << ' closed' if issue.closed?
                 link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options
               end
               # Generates a link to an attachment.
               # Options:
               # * :text - Link text (default to attachment filename)
               # * :download - Force download (default: false)
               def link_to_attachment(attachment, options={})
                 text = options.delete(:text) || attachment.filename
                 action = options.delete(:download) ? 'download' : 'show'
                 link_to(h(text), {:controller => 'attachments', :action => action, :id => attachment, :filename => attachment.filename }, options)
               end
               def toggle_link(name, id, options={})
                 onclick = "Element.toggle('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                 onclick << "return false;"
                 link_to(name, "#", :onclick => onclick)
               end
               def image_to_function(name, function, html_options = {})
                 html_options.symbolize_keys!
                 tag(:input, html_options.merge({
                     :type => "image", :src => image_path(name),
                     :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
                     }))
               end
               def prompt_to_remote(name, text, param, url, html_options = {})
                 html_options[:onclick] = "promptToRemote('#{text}', '#{param}', '#{url_for(url)}'); return false;"
                 link_to name, {}, html_options
               end
               def format_activity_title(text)
                 h(truncate_single_line(text, :length => 100))
               end
               def format_activity_day(date)
                 date == Date.today ? l(:label_today).titleize : format_date(date)
               end
               def format_activity_description(text)
                 h(truncate(text.to_s, :length => 120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...')).gsub(/[\r\n]+/, "<br />")
               end
               def due_date_distance_in_words(date)
                 if date
                   l((date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in), distance_of_date_in_words(Date.today, date))
                 end
               end
               def render_page_hierarchy(pages, node=nil)
                 content = ''
                 if pages[node]
                   content << "<ul class=\"pages-hierarchy\">\n"
                   pages[node].each do |page|
                     content << "<li>"
                     content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'index', :id => page.project, :page => page.title},
                                        :title => (page.respond_to?(:updated_on) ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
                     content << "\n" + render_page_hierarchy(pages, page.id) if pages[page.id]
                     content << "</li>\n"
                   end
                   content << "</ul>\n"
                 end
                 content
               end
               # Renders flash messages
               def render_flash_messages
                 s = ''
                 flash.each do |k,v|
                   s << content_tag('div', v, :class => "flash #{k}")
                 end
                 s
               end
               # Renders the project quick-jump box
               def render_project_jump_box
                 # Retrieve them now to avoid a COUNT query
                 projects = User.current.projects.all
                 if projects.any?
                   s = '<select onchange="if (this.value != \'\') { window.location = this.value; }">' +
                         "<option selected='selected'>#{ l(:label_jump_to_a_project) }</option>" +
                         '<option disabled="disabled">---</option>'
                   s << project_tree_options_for_select(projects) do |p|
                     { :value => url_for(:controller => 'projects', :action => 'show', :id => p, :jump => current_menu_item) }
                   end
                   s << '</select>'
                   s
                 end
               end
               def project_tree_options_for_select(projects, options = {})
                 s = ''
                 project_tree(projects) do |project, level|
                   name_prefix = (level > 0 ? ('&nbsp;' * 2 * level + '&#187; ') : '')
                   tag_options = {:value => project.id, :selected => ((project == options[:selected]) ? 'selected' : nil)}
                   tag_options.merge!(yield(project)) if block_given?
                   s << content_tag('option', name_prefix + h(project), tag_options)
                 end
                 s
               end
               # Yields the given block for each project with its level in the tree
               def project_tree(projects, &block)
                 ancestors = []
                 projects.sort_by(&:lft).each do |project|
                   while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                     ancestors.pop
                   end
                   yield project, ancestors.size
                   ancestors << project
                 end
               end
               def project_nested_ul(projects, &block)
                 s = ''
                 if projects.any?
                   ancestors = []
                   projects.sort_by(&:lft).each do |project|
                     if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
                       s << "<ul>\n"
                     else
                       ancestors.pop
                       s << "</li>"
                       while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                         ancestors.pop
                         s << "</ul></li>\n"
                       end
                     end
                     s << "<li>"
                     s << yield(project).to_s
                     ancestors << project
                   end
                   s << ("</li></ul>\n" * ancestors.size)
                 end
                 s
               end
               # Truncates and returns the string as a single line
               def truncate_single_line(string, *args)
                 truncate(string, *args).gsub(%r{[\r\n]+}m, ' ')
               end
               def html_hours(text)
                 text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>')
               end
               def authoring(created, author, options={})
                 time_tag = @project.nil? ? content_tag('acronym', distance_of_time_in_words(Time.now, created), :title => format_time(created)) :
                                            link_to(distance_of_time_in_words(Time.now, created),
                                                    {:controller => 'projects', :action => 'activity', :id => @project, :from => created.to_date},
                                                    :title => format_time(created))
                 author_tag = (author.is_a?(User) && !author.anonymous?) ? link_to(h(author), :controller => 'account', :action => 'show', :id => author) : h(author || 'Anonymous')
                 l(options[:label] || :label_added_time_by, :author => author_tag, :age => time_tag)
               end
               def syntax_highlight(name, content)
                 type = CodeRay::FileType[name]
                 type ? CodeRay.scan(content, type).html : h(content)
               end
               def to_path_param(path)
                 path.to_s.split(%r{[/\\]}).select {|p| !p.blank?}
               end
               def pagination_links_full(paginator, count=nil, options={})
                 page_param = options.delete(:page_param) || :page
                 url_param = params.dup
                 # don't reuse query params if filters are present
                 url_param.merge!(:fields => nil, :values => nil, :operators => nil) if url_param.delete(:set_filter)
                 html = ''
                 if paginator.current.previous
                   html << link_to_remote_content_update('&#171; ' + l(:label_previous), url_param.merge(page_param => paginator.current.previous)) + ' '
                 end
                 html << (pagination_links_each(paginator, options) do |n|
                   link_to_remote_content_update(n.to_s, url_param.merge(page_param => n))
                 end || '')
                 if paginator.current.next
                   html << ' ' + link_to_remote_content_update((l(:label_next) + ' &#187;'), url_param.merge(page_param => paginator.current.next))
                 end
                 unless count.nil?
                   html << [
                     " (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})",
                     per_page_links(paginator.items_per_page)
                   ].compact.join(' | ')
                 end
                 html
               end
               def per_page_links(selected=nil)
                 url_param = params.dup
                 url_param.clear if url_param.has_key?(:set_filter)
                 links = Setting.per_page_options_array.collect do |n|
                   n == selected ? n : link_to_remote(n, {:update => "content",
                                                          :url => params.dup.merge(:per_page => n),
                                                          :method => :get},
                                                         {:href => url_for(url_param.merge(:per_page => n))})
                 end
                 links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
               end
+              def reorder_links(name, url)
+                link_to(image_tag('2uparrow.png',   :alt => l(:label_sort_highest)), url.merge({"#{name}[move_to]" => 'highest'}), :method => :post, :title => l(:label_sort_highest)) +
+                link_to(image_tag('1uparrow.png',   :alt => l(:label_sort_higher)),  url.merge({"#{name}[move_to]" => 'higher'}),  :method => :post, :title => l(:label_sort_higher)) +
+                link_to(image_tag('1downarrow.png', :alt => l(:label_sort_lower)),   url.merge({"#{name}[move_to]" => 'lower'}),   :method => :post, :title => l(:label_sort_lower)) +
+                link_to(image_tag('2downarrow.png', :alt => l(:label_sort_lowest)),  url.merge({"#{name}[move_to]" => 'lowest'}),  :method => :post, :title => l(:label_sort_lowest))
+              end
               def breadcrumb(*args)
                 elements = args.flatten
                 elements.any? ? content_tag('p', args.join(' &#187; ') + ' &#187; ', :class => 'breadcrumb') : nil
               end
               def other_formats_links(&block)
                 concat('<p class="other-formats">' + l(:label_export_to))
                 yield Redmine::Views::OtherFormatsBuilder.new(self)
                 concat('</p>')
               end
               def page_header_title
                 if @project.nil? || @project.new_record?
                   h(Setting.app_title)
                 else
                   b = []
                   ancestors = (@project.root? ? [] : @project.ancestors.visible)
                   if ancestors.any?
                     root = ancestors.shift
                     b << link_to(h(root), {:controller => 'projects', :action => 'show', :id => root, :jump => current_menu_item}, :class => 'root')
                     if ancestors.size > 2
                       b << '&#8230;'
                       ancestors = ancestors[-2, 2]
                     end
                     b += ancestors.collect {|p| link_to(h(p), {:controller => 'projects', :action => 'show', :id => p, :jump => current_menu_item}, :class => 'ancestor') }
                   end
                   b << h(@project)
                   b.join(' &#187; ')
                 end
               end
               def html_title(*args)
                 if args.empty?
                   title = []
                   title << @project.name if @project
                   title += @html_title if @html_title
                   title << Setting.app_title
                   title.compact.join(' - ')
                 else
                   @html_title ||= []
                   @html_title += args
                 end
               end
               def accesskey(s)
                 Redmine::AccessKeys.key_for s
               end
               # Formats text according to system settings.
               # 2 ways to call this method:
               # * with a String: textilizable(text, options)
               # * with an object and one of its attribute: textilizable(issue, :description, options)
               def textilizable(*args)
                 options = args.last.is_a?(Hash) ? args.pop : {}
                 case args.size
                 when 1
                   obj = options[:object]
                   text = args.shift
                 when 2
                   obj = args.shift
                   text = obj.send(args.shift).to_s
                 else
                   raise ArgumentError, 'invalid arguments to textilizable'
                 end
                 return '' if text.blank?
                 only_path = options.delete(:only_path) == false ? false : true
                 # when using an image link, try to use an attachment, if possible
                 attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
                 if attachments
                   attachments = attachments.sort_by(&:created_on).reverse
                   text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(bmp|gif|jpg|jpeg|png))!/i) do |m|
                     style = $1
                     filename = $6.downcase
                     # search for the picture in attachments
                     if found = attachments.detect { |att| att.filename.downcase == filename }
                       image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found
                       desc = found.description.to_s.gsub(/^([^\(\)]*).*$/, "\\1")
                       alt = desc.blank? ? nil : "(#{desc})"
                       "!#{style}#{image_url}#{alt}!"
                     else
                       m
                     end
                   end
                 end
                 text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text) { |macro, args| exec_macro(macro, obj, args) }
                 # different methods for formatting wiki links
                 case options[:wiki_links]
                 when :local
                   # used for local links to html files
                   format_wiki_link = Proc.new {|project, title, anchor| "#{title}.html" }
                 when :anchor
                   # used for single-file wiki export
                   format_wiki_link = Proc.new {|project, title, anchor| "##{title}" }
                 else
                   format_wiki_link = Proc.new {|project, title, anchor| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title, :anchor => anchor) }
                 end
                 project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
                 # Wiki links
                 #
                 # Examples:
                 #   [[mypage]]
                 #   [[mypage|mytext]]
                 # wiki links can refer other project wikis, using project name or identifier:
                 #   [[project:]] -> wiki starting page
                 #   [[project:|mytext]]
                 #   [[project:mypage]]
                 #   [[project:mypage|mytext]]
                 text = text.gsub(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |m|
                   link_project = project
                   esc, all, page, title = $1, $2, $3, $5
                   if esc.nil?
                     if page =~ /^([^\:]+)\:(.*)$/
                       link_project = Project.find_by_name($1) || Project.find_by_identifier($1)
                       page = $2
                       title ||= $1 if page.blank?
                     end
                     if link_project && link_project.wiki
                       # extract anchor
                       anchor = nil
                       if page =~ /^(.+?)\#(.+)$/
                         page, anchor = $1, $2
                       end
                       # check if page exists
                       wiki_page = link_project.wiki.find_page(page)
                       link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page), anchor),
                                                :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                     else
                       # project or wiki doesn't exist
                       all
                     end
                   else
                     all
                   end
                 end
                 # Redmine links
                 #
                 # Examples:
                 #   Issues:
                 #     #52 -> Link to issue #52
                 #   Changesets:
                 #     r52 -> Link to revision 52
                 #     commit:a85130f -> Link to scmid starting with a85130f
                 #   Documents:
                 #     document#17 -> Link to document with id 17
                 #     document:Greetings -> Link to the document with title "Greetings"
                 #     document:"Some document" -> Link to the document with title "Some document"
                 #   Versions:
                 #     version#3 -> Link to version with id 3
                 #     version:1.0.0 -> Link to version named "1.0.0"
                 #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
                 #   Attachments:
                 #     attachment:file.zip -> Link to the attachment of the current object named file.zip
                 #   Source files:
                 #     source:some/file -> Link to the file located at /some/file in the project's repository
                 #     source:some/file@52 -> Link to the file's revision 52
                 #     source:some/file#L120 -> Link to line 120 of the file
                 #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
                 #     export:some/file -> Force the download of the file
                 #  Forum messages:
                 #     message#1218 -> Link to message with id 1218
                 text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|\s|<|$)}) do |m|
                   leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
                   link = nil
                   if esc.nil?
                     if prefix.nil? && sep == 'r'
                       if project && (changeset = project.changesets.find_by_revision(oid))
                         link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => oid},
                                                   :class => 'changeset',
                                                   :title => truncate_single_line(changeset.comments, :length => 100))
                       end
                     elsif sep == '#'
                       oid = oid.to_i
                       case prefix
                       when nil
                         if issue = Issue.find_by_id(oid, :include => [:project, :status], :conditions => Project.visible_by(User.current))
                           link = link_to("##{oid}", {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid},
                                                     :class => (issue.closed? ? 'issue closed' : 'issue'),
                                                     :title => "#{truncate(issue.subject, :length => 100)} (#{issue.status.name})")
                           link = content_tag('del', link) if issue.closed?
                         end
                       when 'document'
                         if document = Document.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if version = Version.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       when 'message'
                         if message = Message.find_by_id(oid, :include => [:parent, {:board => :project}], :conditions => Project.visible_by(User.current))
                           link = link_to h(truncate(message.subject, :length => 60)), {:only_path => only_path,
                                                                             :controller => 'messages',
                                                                             :action => 'show',
                                                                             :board_id => message.board,
                                                                             :id => message.root,
                                                                             :anchor => (message.parent ? "message-#{message.id}" : nil)},
                                                              :class => 'message'
                         end
                       end
                     elsif sep == ':'
                       # removes the double quotes if any
                       name = oid.gsub(%r{^"(.*)"$}, "\\1")
                       case prefix
                       when 'document'
                         if project && document = project.documents.find_by_title(name)
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if project && version = project.versions.find_by_name(name)
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       when 'commit'
                         if project && (changeset = project.changesets.find(:first, :conditions => ["scmid LIKE ?", "#{name}%"]))
                           link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision},
                                                        :class => 'changeset',
                                                        :title => truncate_single_line(changeset.comments, :length => 100)
                         end
                       when 'source', 'export'
                         if project && project.repository
                           name =~ %r{^[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?$}
                           path, rev, anchor = $1, $3, $5
                           link = link_to h("#{prefix}:#{name}"), {:controller => 'repositories', :action => 'entry', :id => project,
                                                                   :path => to_path_param(path),
                                                                   :rev => rev,
                                                                   :anchor => anchor,
                                                                   :format => (prefix == 'export' ? 'raw' : nil)},
                                                                  :class => (prefix == 'export' ? 'source download' : 'source')
                         end
                       when 'attachment'
                         if attachments && attachment = attachments.detect {|a| a.filename == name }
                           link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
                                                                  :class => 'attachment'
                         end
                       end
                     end
                   end
                   leading + (link || "#{prefix}#{sep}#{oid}")
                 end
                 text
               end
               # Same as Rails' simple_format helper without using paragraphs
               def simple_format_without_paragraph(text)
                 text.to_s.
                   gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
                   gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
                   gsub(/([^\n]\n)(?=[^\n])/, '\1<br />')  # 1 newline   -> br
               end
               def lang_options_for_select(blank=true)
                 (blank ? [["(auto)", ""]] : []) +
                   valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.last <=> y.last }
               end
               def label_tag_for(name, option_tags = nil, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 content_tag("label", label_text)
               end
               def labelled_tabular_form_for(name, object, options, &proc)
                 options[:html] ||= {}
                 options[:html][:class] = 'tabular' unless options[:html].has_key?(:class)
                 form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
               end
               def back_url_hidden_field_tag
                 back_url = params[:back_url] || request.env['HTTP_REFERER']
                 back_url = CGI.unescape(back_url.to_s)
                 hidden_field_tag('back_url', CGI.escape(back_url)) unless back_url.blank?
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | " +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def progress_bar(pcts, options={})
                 pcts = [pcts, pcts] unless pcts.is_a?(Array)
                 pcts[1] = pcts[1] - pcts[0]
                 pcts << (100 - pcts[1] - pcts[0])
                 width = options[:width] || '100px;'
                 legend = options[:legend] || ''
                 content_tag('table',
                   content_tag('tr',
                     (pcts[0] > 0 ? content_tag('td', '', :style => "width: #{pcts[0].floor}%;", :class => 'closed') : '') +
                     (pcts[1] > 0 ? content_tag('td', '', :style => "width: #{pcts[1].floor}%;", :class => 'done') : '') +
                     (pcts[2] > 0 ? content_tag('td', '', :style => "width: #{pcts[2].floor}%;", :class => 'todo') : '')
                   ), :class => 'progress', :style => "width: #{width};") +
                   content_tag('p', legend, :class => 'pourcent')
               end
               def context_menu_link(name, url, options={})
                 options[:class] ||= ''
                 if options.delete(:selected)
                   options[:class] << ' icon-checked disabled'
                   options[:disabled] = true
                 end
                 if options.delete(:disabled)
                   options.delete(:method)
                   options.delete(:confirm)
                   options.delete(:onclick)
                   options[:class] << ' disabled'
                   url = '#'
                 end
                 link_to name, url, options
               end
               def calendar_for(field_id)
                 include_calendar_headers_tags
                 image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
                 javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
               end
               def include_calendar_headers_tags
                 unless @calendar_headers_tags_included
                   @calendar_headers_tags_included = true
                   content_for :header_tags do
                     javascript_include_tag('calendar/calendar') +
                     javascript_include_tag("calendar/lang/calendar-#{current_language}.js") +
                     javascript_include_tag('calendar/calendar-setup') +
                     stylesheet_link_tag('calendar')
                   end
                 end
               end
               def content_for(name, content = nil, &block)
                 @has_content ||= {}
                 @has_content[name] = true
                 super(name, content, &block)
               end
               def has_content?(name)
                 (@has_content && @has_content[name]) || false
               end
               # Returns the avatar image tag for the given +user+ if avatars are enabled
               # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
               def avatar(user, options = { })
                 if Setting.gravatar_enabled?
                   email = nil
                   if user.respond_to?(:mail)
                     email = user.mail
                   elsif user.to_s =~ %r{<(.+?)>}
                     email = $1
                   end
                   return gravatar(email.to_s.downcase, options) unless email.blank? rescue nil
                 end
               end
               private
               def wiki_helper
                 helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
                 extend helper
                 return self
               end
               def link_to_remote_content_update(text, url_params)
                 link_to_remote(text,
                   {:url => url_params, :method => :get, :update => 'content', :complete => 'window.scrollTo(0,0)'},
                   {:href => url_for(:params => url_params)}
                 )
               end
             end

app/views/trackers/list.rhtml +1 -6

             <div class="contextual">
             <%= link_to l(:label_tracker_new), {:action => 'new'}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_tracker_plural)%></h2>
             <table class="list">
               <thead><tr>
               <th><%=l(:label_tracker)%></th>
               <th></th>
               <th><%=l(:button_sort)%></th>
               <th></th>
               </tr></thead>
               <tbody>
             <% for tracker in @trackers %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to tracker.name, :action => 'edit', :id => tracker %></td>
               <td align="center"><% unless tracker.workflows.count > 0 %><span class="icon icon-warning"><%= l(:text_tracker_no_workflow) %> (<%= link_to l(:button_edit), {:controller => 'workflows', :action => 'edit', :tracker_id => tracker} %>)</span><% end %></td>
-              <td align="center" style="width:15%;">
+              <td align="center" style="width:15%;"><%= reorder_links('tracker', {:action => 'edit', :id => tracker}) %></td>
-                <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:action => 'move', :id => tracker, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %>
-                <%= link_to image_tag('1uparrow.png', :alt => l(:label_sort_higher)), {:action => 'move', :id => tracker, :position => 'higher'}, :method => :post, :title => l(:label_sort_higher) %> -
-                <%= link_to image_tag('1downarrow.png', :alt => l(:label_sort_lower)), {:action => 'move', :id => tracker, :position => 'lower'}, :method => :post, :title => l(:label_sort_lower) %>
-                <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => tracker, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
-              </td>
               <td align="center" style="width:10%;">
                 <%= button_to l(:button_delete), { :action => 'destroy', :id => tracker }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @tracker_pages %></p>
             <% html_title(l(:label_tracker_plural)) -%>

test/functional/trackers_controller_test.rb +52 -1

             # Redmine - project management software
             # Copyright (C) 2006-2009  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 'trackers_controller'
             # Re-raise errors caught by the controller.
             class TrackersController; def rescue_action(e) raise e end; end
             class TrackersControllerTest < Test::Unit::TestCase
-              fixtures :trackers, :projects, :projects_trackers, :users
+              fixtures :trackers, :projects, :projects_trackers, :users, :issues
               def setup
                 @controller = TrackersController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
               end
+              def test_index
+                get :index
+                assert_response :success
+                assert_template 'list'
+              end
+              def test_get_new
+                get :new
+                assert_response :success
+                assert_template 'new'
+              end
+              def test_post_new
+                post :new, :tracker => { :name => 'New tracker', :project_ids => ['1', '', ''] }
+                assert_redirected_to '/trackers/list'
+                tracker = Tracker.find_by_name('New tracker')
+                assert_equal [1], tracker.project_ids.sort
+                assert_equal 0, tracker.workflows.count
+              end
+              def test_post_new_with_workflow_copy
+                post :new, :tracker => { :name => 'New tracker' }, :copy_workflow_from => 1
+                assert_redirected_to '/trackers/list'
+                tracker = Tracker.find_by_name('New tracker')
+                assert_equal 0, tracker.projects.count
+                assert_equal Tracker.find(1).workflows.count, tracker.workflows.count
+              end
               def test_get_edit
                 Tracker.find(1).project_ids = [1, 3]
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 assert_tag :input, :attributes => { :name => 'tracker[project_ids][]',
                                                     :value => '1',
                                                     :checked => 'checked' }
                 assert_tag :input, :attributes => { :name => 'tracker[project_ids][]',
                                                     :value => '2',
                                                     :checked => nil }
                 assert_tag :input, :attributes => { :name => 'tracker[project_ids][]',
                                                     :value => '',
                                                     :type => 'hidden'}
               end
               def test_post_edit
                 post :edit, :id => 1, :tracker => { :name => 'Renamed',
                                                     :project_ids => ['1', '2', ''] }
                 assert_redirected_to '/trackers/list'
                 assert_equal [1, 2], Tracker.find(1).project_ids.sort
               end
               def test_post_edit_without_projects
                 post :edit, :id => 1, :tracker => { :name => 'Renamed',
                                                     :project_ids => [''] }
                 assert_redirected_to '/trackers/list'
                 assert Tracker.find(1).project_ids.empty?
               end
+              def test_move_lower
+               tracker = Tracker.find_by_position(1)
+               post :edit, :id => 1, :tracker => { :move_to => 'lower' }
+               assert_equal 2, tracker.reload.position
+              end
+              def test_destroy
+                tracker = Tracker.create!(:name => 'Destroyable')
+                assert_difference 'Tracker.count', -1 do
+                  post :destroy, :id => tracker.id
+                end
+                assert_redirected_to '/trackers/list'
+                assert_nil flash[:error]
+              end
+              def test_destroy_tracker_in_use
+                assert_no_difference 'Tracker.count' do
+                  post :destroy, :id => 1
+                end
+                assert_redirected_to '/trackers/list'
+                assert_not_nil flash[:error]
+              end
             end

vendor/plugins/acts_as_list/lib/active_record/acts/list.rb +14 0

             module ActiveRecord
               module Acts #:nodoc:
                 module List #:nodoc:
                   def self.included(base)
                     base.extend(ClassMethods)
                   end
                   # This +acts_as+ extension provides the capabilities for sorting and reordering a number of objects in a list.
                   # The class that has this specified needs to have a +position+ column defined as an integer on
                   # the mapped database table.
                   #
                   # Todo list example:
                   #
                   #   class TodoList < ActiveRecord::Base
                   #     has_many :todo_items, :order => "position"
                   #   end
                   #
                   #   class TodoItem < ActiveRecord::Base
                   #     belongs_to :todo_list
                   #     acts_as_list :scope => :todo_list
                   #   end
                   #
                   #   todo_list.first.move_to_bottom
                   #   todo_list.last.move_higher
                   module ClassMethods
                     # Configuration options are:
                     #
                     # * +column+ - specifies the column name to use for keeping the position integer (default: +position+)
                     # * +scope+ - restricts what is to be considered a list. Given a symbol, it'll attach <tt>_id</tt>
                     #   (if it hasn't already been added) and use that as the foreign key restriction. It's also possible
                     #   to give it an entire string that is interpolated if you need a tighter scope than just a foreign key.
                     #   Example: <tt>acts_as_list :scope => 'todo_list_id = #{todo_list_id} AND completed = 0'</tt>
                     def acts_as_list(options = {})
                       configuration = { :column => "position", :scope => "1 = 1" }
                       configuration.update(options) if options.is_a?(Hash)
                       configuration[:scope] = "#{configuration[:scope]}_id".intern if configuration[:scope].is_a?(Symbol) && configuration[:scope].to_s !~ /_id$/
                       if configuration[:scope].is_a?(Symbol)
                         scope_condition_method = %(
                           def scope_condition
                             if #{configuration[:scope].to_s}.nil?
                               "#{configuration[:scope].to_s} IS NULL"
                             else
                               "#{configuration[:scope].to_s} = \#{#{configuration[:scope].to_s}}"
                             end
                           end
                         )
                       else
                         scope_condition_method = "def scope_condition() \"#{configuration[:scope]}\" end"
                       end
                       class_eval <<-EOV
                         include ActiveRecord::Acts::List::InstanceMethods
                         def acts_as_list_class
                           ::#{self.name}
                         end
                         def position_column
                           '#{configuration[:column]}'
                         end
                         #{scope_condition_method}
                         before_destroy :remove_from_list
                         before_create  :add_to_list_bottom
                       EOV
                     end
                   end
                   # All the methods available to a record that has had <tt>acts_as_list</tt> specified. Each method works
                   # by assuming the object to be the item in the list, so <tt>chapter.move_lower</tt> would move that chapter
                   # lower in the list of all chapters. Likewise, <tt>chapter.first?</tt> would return +true+ if that chapter is
                   # the first in the list of all chapters.
                   module InstanceMethods
                     # Insert the item at the given position (defaults to the top position of 1).
                     def insert_at(position = 1)
                       insert_at_position(position)
                     end
                     # Swap positions with the next lower item, if one exists.
                     def move_lower
                       return unless lower_item
                       acts_as_list_class.transaction do
                         lower_item.decrement_position
                         increment_position
                       end
                     end
                     # Swap positions with the next higher item, if one exists.
                     def move_higher
                       return unless higher_item
                       acts_as_list_class.transaction do
                         higher_item.increment_position
                         decrement_position
                       end
                     end
                     # Move to the bottom of the list. If the item is already in the list, the items below it have their
                     # position adjusted accordingly.
                     def move_to_bottom
                       return unless in_list?
                       acts_as_list_class.transaction do
                         decrement_positions_on_lower_items
                         assume_bottom_position
                       end
                     end
                     # Move to the top of the list. If the item is already in the list, the items above it have their
                     # position adjusted accordingly.
                     def move_to_top
                       return unless in_list?
                       acts_as_list_class.transaction do
                         increment_positions_on_higher_items
                         assume_top_position
                       end
                     end
+                    # Move to the given position
+                    def move_to=(pos)
+                      case pos.to_s
+                      when 'highest'
+                        move_to_top
+                      when 'higher'
+                        move_higher
+                      when 'lower'
+                        move_lower
+                      when 'lowest'
+                        move_to_bottom
+                      end
+                    end
                     # Removes the item from the list.
                     def remove_from_list
                       if in_list?
                         decrement_positions_on_lower_items
                         update_attribute position_column, nil
                       end
                     end
                     # Increase the position of this item without adjusting the rest of the list.
                     def increment_position
                       return unless in_list?
                       update_attribute position_column, self.send(position_column).to_i + 1
                     end
                     # Decrease the position of this item without adjusting the rest of the list.
                     def decrement_position
                       return unless in_list?
                       update_attribute position_column, self.send(position_column).to_i - 1
                     end
                     # Return +true+ if this object is the first in the list.
                     def first?
                       return false unless in_list?
                       self.send(position_column) == 1
                     end
                     # Return +true+ if this object is the last in the list.
                     def last?
                       return false unless in_list?
                       self.send(position_column) == bottom_position_in_list
                     end
                     # Return the next higher item in the list.
                     def higher_item
                       return nil unless in_list?
                       acts_as_list_class.find(:first, :conditions =>
                         "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i - 1).to_s}"
                       )
                     end
                     # Return the next lower item in the list.
                     def lower_item
                       return nil unless in_list?
                       acts_as_list_class.find(:first, :conditions =>
                         "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i + 1).to_s}"
                       )
                     end
                     # Test if this record is in a list
                     def in_list?
                       !send(position_column).nil?
                     end
                     private
                       def add_to_list_top
                         increment_positions_on_all_items
                       end
                       def add_to_list_bottom
                         self[position_column] = bottom_position_in_list.to_i + 1
                       end
                       # Overwrite this method to define the scope of the list changes
                       def scope_condition() "1" end
                       # Returns the bottom position number in the list.
                       #   bottom_position_in_list    # => 2
                       def bottom_position_in_list(except = nil)
                         item = bottom_item(except)
                         item ? item.send(position_column) : 0
                       end
                       # Returns the bottom item
                       def bottom_item(except = nil)
                         conditions = scope_condition
                         conditions = "#{conditions} AND #{self.class.primary_key} != #{except.id}" if except
                         acts_as_list_class.find(:first, :conditions => conditions, :order => "#{position_column} DESC")
                       end
                       # Forces item to assume the bottom position in the list.
                       def assume_bottom_position
                         update_attribute(position_column, bottom_position_in_list(self).to_i + 1)
                       end
                       # Forces item to assume the top position in the list.
                       def assume_top_position
                         update_attribute(position_column, 1)
                       end
                       # This has the effect of moving all the higher items up one.
                       def decrement_positions_on_higher_items(position)
                         acts_as_list_class.update_all(
                           "#{position_column} = (#{position_column} - 1)", "#{scope_condition} AND #{position_column} <= #{position}"
                         )
                       end
                       # This has the effect of moving all the lower items up one.
                       def decrement_positions_on_lower_items
                         return unless in_list?
                         acts_as_list_class.update_all(
                           "#{position_column} = (#{position_column} - 1)", "#{scope_condition} AND #{position_column} > #{send(position_column).to_i}"
                         )
                       end
                       # This has the effect of moving all the higher items down one.
                       def increment_positions_on_higher_items
                         return unless in_list?
                         acts_as_list_class.update_all(
                           "#{position_column} = (#{position_column} + 1)", "#{scope_condition} AND #{position_column} < #{send(position_column).to_i}"
                         )
                       end
                       # This has the effect of moving all the lower items down one.
                       def increment_positions_on_lower_items(position)
                         acts_as_list_class.update_all(
                           "#{position_column} = (#{position_column} + 1)", "#{scope_condition} AND #{position_column} >= #{position}"
                        )
                       end
                       # Increments position (<tt>position_column</tt>) of all items in the list.
                       def increment_positions_on_all_items
                         acts_as_list_class.update_all(
                           "#{position_column} = (#{position_column} + 1)",  "#{scope_condition}"
                         )
                       end
                       def insert_at_position(position)
                         remove_from_list
                         increment_positions_on_lower_items(position)
                         self.update_attribute(position_column, position)
                       end
                   end
                 end
               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