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

               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])

app/controllers/boards_controller.rb +4 -2

               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']

app/controllers/issues_controller.rb +6 -4

               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|
               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,

app/controllers/projects_controller.rb +6 -2

               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

app/controllers/timelog_controller.rb +6 -1

               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?

app/controllers/users_controller.rb +1 -1

               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])

app/helpers/queries_helper.rb +2 -2

               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

app/helpers/sort_helper.rb +13 -5

               # 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.

app/models/mailer.rb +1 -1

                 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)

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

               <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| %>

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

                     <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 %>

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

             <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

             <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>

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

             <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>

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

                 <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 -%>

lib/redcloth3.rb +9 -6

                 #   [ /"(?=[#{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
                 # 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
                         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
                         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"' : ''

test/functional/issues_controller_test.rb +10 0

@@ -137,6 +137,16 class IssuesControllerTest < Test::Unit::TestCase
137	assert_not_nil assigns(:issues)	137	assert_not_nil assigns(:issues)
138	assert_equal 'application/pdf', @response.content_type	138	assert_equal 'application/pdf', @response.content_type
139	end	139	end
		140
		141	def test_index_sort
		142	get :index, :sort_key => 'tracker'
		143	assert_response :success
		144
		145	sort_params = @request.session['issuesindex_sort']
		146	assert sort_params.is_a?(Hash)
		147	assert_equal 'tracker', sort_params[:key]
		148	assert_equal 'ASC', sort_params[:order]
		149	end
140		150
141	def test_gantt	151	def test_gantt
142	get :gantt, :project_id => 1	152	get :gantt, :project_id => 1

test/unit/helpers/application_helper_test.rb +10 0

                 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" />',
                   '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"

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