jro_apps/redmine Commit - r15248:731eadc4502f

Don't generate urls with params....

Jean-Philippe Lang -

r15248:731eadc4502f

parent child

Context file:

r15248:731eadc4502f

Collapse all files

app/helpers/calendars_helper.rb +1 -1

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2016  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 CalendarsHelper
               def link_to_previous_month(year, month, options={})
                 target_year, target_month = if month == 1
                                               [year - 1, 12]
                                             else
                                               [year, month - 1]
                                             end
                 name = if target_month == 12
                          "#{month_name(target_month)} #{target_year}"
                        else
                          "#{month_name(target_month)}"
                        end
                 # \xc2\xab(utf-8) = &#171;
                 link_to_month(("\xc2\xab " + name), target_year, target_month, options)
               end
               def link_to_next_month(year, month, options={})
                 target_year, target_month = if month == 12
                                               [year + 1, 1]
                                             else
                                               [year, month + 1]
                                             end
                 name = if target_month == 1
                          "#{month_name(target_month)} #{target_year}"
                        else
                          "#{month_name(target_month)}"
                        end
                 # \xc2\xbb(utf-8) = &#187;
                 link_to_month((name + " \xc2\xbb"), target_year, target_month, options)
               end
               def link_to_month(link_name, year, month, options={})
-                link_to(link_name, params.merge(:year => year, :month => month), options)
+                link_to(link_name, {:params => request.query_parameters.merge(:year => year, :month => month)}, options)
               end
             end

app/helpers/gantt_helper.rb +2 -2

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2016  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 GanttHelper
               def gantt_zoom_link(gantt, in_or_out)
                 case in_or_out
                 when :in
                   if gantt.zoom < 4
                     link_to l(:text_zoom_in),
-                      params.merge(gantt.params.merge(:zoom => (gantt.zoom + 1))),
+                      {:params => request.query_parameters.merge(gantt.params.merge(:zoom => (gantt.zoom + 1)))},
                       :class => 'icon icon-zoom-in'
                   else
                     content_tag(:span, l(:text_zoom_in), :class => 'icon icon-zoom-in').html_safe
                   end
                 when :out
                   if gantt.zoom > 1
                     link_to l(:text_zoom_out),
-                      params.merge(gantt.params.merge(:zoom => (gantt.zoom - 1))),
+                      {:params => request.query_parameters.merge(gantt.params.merge(:zoom => (gantt.zoom - 1)))},
                       :class => 'icon icon-zoom-out'
                   else
                     content_tag(:span, l(:text_zoom_out), :class => 'icon icon-zoom-out').html_safe
                   end
                 end
               end
             end

app/helpers/issues_helper.rb +1 -1

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2016  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 IssuesHelper
               include ApplicationHelper
               include Redmine::Export::PDF::IssuesPdfHelper
               def issue_list(issues, &block)
                 ancestors = []
                 issues.each do |issue|
                   while (ancestors.any? && !issue.is_descendant_of?(ancestors.last))
                     ancestors.pop
                   end
                   yield issue, ancestors.size
                   ancestors << issue unless issue.leaf?
                 end
               end
               def grouped_issue_list(issues, query, issue_count_by_group, &block)
                 previous_group, first = false, true
                 totals_by_group = query.totalable_columns.inject({}) do |h, column|
                   h[column] = query.total_by_group_for(column)
                   h
                 end
                 issue_list(issues) do |issue, level|
                   group_name = group_count = nil
                   if query.grouped?
                     group = query.group_by_column.value(issue)
                     if first || group != previous_group
                       if group.blank? && group != false
                         group_name = "(#{l(:label_blank_value)})"
                       else
                         group_name = format_object(group)
                       end
                       group_name ||= ""
                       group_count = issue_count_by_group[group]
                       group_totals = totals_by_group.map {|column, t| total_tag(column, t[group] || 0)}.join(" ").html_safe
                     end
                   end
                   yield issue, level, group_name, group_count, group_totals
                   previous_group, first = group, false
                 end
               end
               # Renders a HTML/CSS tooltip
               #
               # To use, a trigger div is needed.  This is a div with the class of "tooltip"
               # that contains this method wrapped in a span with the class of "tip"
               #
               #    <div class="tooltip"><%= link_to_issue(issue) %>
               #      <span class="tip"><%= render_issue_tooltip(issue) %></span>
               #    </div>
               #
               def render_issue_tooltip(issue)
                 @cached_label_status ||= l(:field_status)
                 @cached_label_start_date ||= l(:field_start_date)
                 @cached_label_due_date ||= l(:field_due_date)
                 @cached_label_assigned_to ||= l(:field_assigned_to)
                 @cached_label_priority ||= l(:field_priority)
                 @cached_label_project ||= l(:field_project)
                 link_to_issue(issue) + "<br /><br />".html_safe +
                   "<strong>#{@cached_label_project}</strong>: #{link_to_project(issue.project)}<br />".html_safe +
                   "<strong>#{@cached_label_status}</strong>: #{h(issue.status.name)}<br />".html_safe +
                   "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />".html_safe +
                   "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />".html_safe +
                   "<strong>#{@cached_label_assigned_to}</strong>: #{h(issue.assigned_to)}<br />".html_safe +
                   "<strong>#{@cached_label_priority}</strong>: #{h(issue.priority.name)}".html_safe
               end
               def issue_heading(issue)
                 h("#{issue.tracker} ##{issue.id}")
               end
               def render_issue_subject_with_tree(issue)
                 s = ''
                 ancestors = issue.root? ? [] : issue.ancestors.visible.to_a
                 ancestors.each do |ancestor|
                   s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id)))
                 end
                 s << '<div>'
                 subject = h(issue.subject)
                 if issue.is_private?
                   subject = content_tag('span', l(:field_is_private), :class => 'private') + ' ' + subject
                 end
                 s << content_tag('h3', subject)
                 s << '</div>' * (ancestors.size + 1)
                 s.html_safe
               end
               def render_descendants_tree(issue)
                 s = '<form><table class="list issues">'
                 issue_list(issue.descendants.visible.preload(:status, :priority, :tracker, :assigned_to).sort_by(&:lft)) do |child, level|
                   css = "issue issue-#{child.id} hascontextmenu #{issue.css_classes}"
                   css << " idnt idnt-#{level}" if level > 0
                   s << content_tag('tr',
                          content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') +
                          content_tag('td', link_to_issue(child, :project => (issue.project_id != child.project_id)), :class => 'subject', :style => 'width: 50%') +
                          content_tag('td', h(child.status), :class => 'status') +
                          content_tag('td', link_to_user(child.assigned_to), :class => 'assigned_to') +
                          content_tag('td', child.disabled_core_fields.include?('done_ratio') ? '' : progress_bar(child.done_ratio), :class=> 'done_ratio'),
                          :class => css)
                 end
                 s << '</table></form>'
                 s.html_safe
               end
               def issue_estimated_hours_details(issue)
                 if issue.total_estimated_hours.present?
                   if issue.total_estimated_hours == issue.estimated_hours
                     l_hours_short(issue.estimated_hours)
                   else
                     s = issue.estimated_hours.present? ? l_hours_short(issue.estimated_hours) : ""
                     s << " (#{l(:label_total)}: #{l_hours_short(issue.total_estimated_hours)})"
                     s.html_safe
                   end
                 end
               end
               def issue_spent_hours_details(issue)
                 if issue.total_spent_hours > 0
                   if issue.total_spent_hours == issue.spent_hours
                     link_to(l_hours_short(issue.spent_hours), issue_time_entries_path(issue))
                   else
                     s = issue.spent_hours > 0 ? l_hours_short(issue.spent_hours) : ""
                     s << " (#{l(:label_total)}: #{link_to l_hours_short(issue.total_spent_hours), issue_time_entries_path(issue)})"
                     s.html_safe
                   end
                 end
               end
               # Returns an array of error messages for bulk edited issues
               def bulk_edit_error_messages(issues)
                 messages = {}
                 issues.each do |issue|
                   issue.errors.full_messages.each do |message|
                     messages[message] ||= []
                     messages[message] << issue
                   end
                 end
                 messages.map { |message, issues|
                   "#{message}: " + issues.map {|i| "##{i.id}"}.join(', ')
                 }
              end
               # Returns a link for adding a new subtask to the given issue
               def link_to_new_subtask(issue)
                 attrs = {
                   :parent_issue_id => issue
                 }
                 attrs[:tracker_id] = issue.tracker unless issue.tracker.disabled_core_fields.include?('parent_issue_id')
                 link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs))
               end
               def trackers_options_for_select(issue)
                 trackers = issue.allowed_target_trackers
                 if issue.new_record? && issue.parent_issue_id.present?
                   trackers = trackers.reject do |tracker|
                     issue.tracker_id != tracker.id && tracker.disabled_core_fields.include?('parent_issue_id')
                   end
                 end
                 trackers.collect {|t| [t.name, t.id]}
               end
               class IssueFieldsRows
                 include ActionView::Helpers::TagHelper
                 def initialize
                   @left = []
                   @right = []
                 end
                 def left(*args)
                   args.any? ? @left << cells(*args) : @left
                 end
                 def right(*args)
                   args.any? ? @right << cells(*args) : @right
                 end
                 def size
                   @left.size > @right.size ? @left.size : @right.size
                 end
                 def to_html
                   content =
                     content_tag('div', @left.reduce(&:+), :class => 'splitcontentleft') +
                     content_tag('div', @right.reduce(&:+), :class => 'splitcontentleft')
                   content_tag('div', content, :class => 'splitcontent')
                 end
                 def cells(label, text, options={})
                   options[:class] = [options[:class] || "", 'attribute'].join(' ')
                   content_tag 'div',
                     content_tag('div', label + ":", :class => 'label') + content_tag('div', text, :class => 'value'),
                     options
                 end
               end
               def issue_fields_rows
                 r = IssueFieldsRows.new
                 yield r
                 r.to_html
               end
               def render_custom_fields_rows(issue)
                 values = issue.visible_custom_field_values
                 return if values.empty?
                 half = (values.size / 2.0).ceil
                 issue_fields_rows do |rows|
                   values.each_with_index do |value, i|
                     css = "cf_#{value.custom_field.id}"
                     m = (i < half ? :left : :right)
                     rows.send m, custom_field_name_tag(value.custom_field), show_value(value), :class => css
                   end
                 end
               end
               # Returns the path for updating the issue form
               # with project as the current project
               def update_issue_form_path(project, issue)
                 options = {:format => 'js'}
                 if issue.new_record?
                   if project
                     new_project_issue_path(project, options)
                   else
                     new_issue_path(options)
                   end
                 else
                   edit_issue_path(issue, options)
                 end
               end
               # Returns the number of descendants for an array of issues
               def issues_descendant_count(issues)
                 ids = issues.reject(&:leaf?).map {|issue| issue.descendants.ids}.flatten.uniq
                 ids -= issues.map(&:id)
                 ids.size
               end
               def issues_destroy_confirmation_message(issues)
                 issues = [issues] unless issues.is_a?(Array)
                 message = l(:text_issues_destroy_confirmation)
                 descendant_count = issues_descendant_count(issues)
                 if descendant_count > 0
                   message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count)
                 end
                 message
               end
               # Returns an array of users that are proposed as watchers
               # on the new issue form
               def users_for_new_issue_watchers(issue)
                 users = issue.watcher_users
                 if issue.project.users.count <= 20
                   users = (users + issue.project.users.sort).uniq
                 end
                 users
               end
               def sidebar_queries
                 unless @sidebar_queries
                   @sidebar_queries = IssueQuery.visible.
                     order("#{Query.table_name}.name ASC").
                     # Project specific queries and global queries
                     where(@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id]).
                     to_a
                 end
                 @sidebar_queries
               end
               def query_links(title, queries)
                 return '' if queries.empty?
                 # links to #index on issues/show
-                url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params
+                url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : {}
                 content_tag('h3', title) + "\n" +
                   content_tag('ul',
                     queries.collect {|query|
                         css = 'query'
                         css << ' selected' if query == @query
                         content_tag('li', link_to(query.name, url_params.merge(:query_id => query), :class => css))
                       }.join("\n").html_safe,
                     :class => 'queries'
                   ) + "\n"
               end
               def render_sidebar_queries
                 out = ''.html_safe
                 out << query_links(l(:label_my_queries), sidebar_queries.select(&:is_private?))
                 out << query_links(l(:label_query_plural), sidebar_queries.reject(&:is_private?))
                 out
               end
               def email_issue_attributes(issue, user)
                 items = []
                 %w(author status priority assigned_to category fixed_version).each do |attribute|
                   unless issue.disabled_core_fields.include?(attribute+"_id")
                     items << "#{l("field_#{attribute}")}: #{issue.send attribute}"
                   end
                 end
                 issue.visible_custom_field_values(user).each do |value|
                   items << "#{value.custom_field.name}: #{show_value(value, false)}"
                 end
                 items
               end
               def render_email_issue_attributes(issue, user, html=false)
                 items = email_issue_attributes(issue, user)
                 if html
                   content_tag('ul', items.map{|s| content_tag('li', s)}.join("\n").html_safe)
                 else
                   items.map{|s| "* #{s}"}.join("\n")
                 end
               end
               # Returns the textual representation of a journal details
               # as an array of strings
               def details_to_strings(details, no_html=false, options={})
                 options[:only_path] = (options[:only_path] == false ? false : true)
                 strings = []
                 values_by_field = {}
                 details.each do |detail|
                   if detail.property == 'cf'
                     field = detail.custom_field
                     if field && field.multiple?
                       values_by_field[field] ||= {:added => [], :deleted => []}
                       if detail.old_value
                         values_by_field[field][:deleted] << detail.old_value
                       end
                       if detail.value
                         values_by_field[field][:added] << detail.value
                       end
                       next
                     end
                   end
                   strings << show_detail(detail, no_html, options)
                 end
                 if values_by_field.present?
                   multiple_values_detail = Struct.new(:property, :prop_key, :custom_field, :old_value, :value)
                   values_by_field.each do |field, changes|
                     if changes[:added].any?
                       detail = multiple_values_detail.new('cf', field.id.to_s, field)
                       detail.value = changes[:added]
                       strings << show_detail(detail, no_html, options)
                     end
                     if changes[:deleted].any?
                       detail = multiple_values_detail.new('cf', field.id.to_s, field)
                       detail.old_value = changes[:deleted]
                       strings << show_detail(detail, no_html, options)
                     end
                   end
                 end
                 strings
               end
               # Returns the textual representation of a single journal detail
               def show_detail(detail, no_html=false, options={})
                 multiple = false
                 show_diff = false
                 case detail.property
                 when 'attr'
                   field = detail.prop_key.to_s.gsub(/\_id$/, "")
                   label = l(("field_" + field).to_sym)
                   case detail.prop_key
                   when 'due_date', 'start_date'
                     value = format_date(detail.value.to_date) if detail.value
                     old_value = format_date(detail.old_value.to_date) if detail.old_value
                   when 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',
                         'priority_id', 'category_id', 'fixed_version_id'
                     value = find_name_by_reflection(field, detail.value)
                     old_value = find_name_by_reflection(field, detail.old_value)
                   when 'estimated_hours'
                     value = l_hours_short(detail.value.to_f) unless detail.value.blank?
                     old_value = l_hours_short(detail.old_value.to_f) unless detail.old_value.blank?
                   when 'parent_id'
                     label = l(:field_parent_issue)
                     value = "##{detail.value}" unless detail.value.blank?
                     old_value = "##{detail.old_value}" unless detail.old_value.blank?
                   when 'is_private'
                     value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
                     old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
                   when 'description'
                     show_diff = true
                   end
                 when 'cf'
                   custom_field = detail.custom_field
                   if custom_field
                     label = custom_field.name
                     if custom_field.format.class.change_as_diff
                       show_diff = true
                     else
                       multiple = custom_field.multiple?
                       value = format_value(detail.value, custom_field) if detail.value
                       old_value = format_value(detail.old_value, custom_field) if detail.old_value
                     end
                   end
                 when 'attachment'
                   label = l(:label_attachment)
                 when 'relation'
                   if detail.value && !detail.old_value
                     rel_issue = Issue.visible.find_by_id(detail.value)
                     value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.value}" :
                               (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
                   elsif detail.old_value && !detail.value
                     rel_issue = Issue.visible.find_by_id(detail.old_value)
                     old_value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.old_value}" :
                                       (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
                   end
                   relation_type = IssueRelation::TYPES[detail.prop_key]
                   label = l(relation_type[:name]) if relation_type
                 end
                 call_hook(:helper_issues_show_detail_after_setting,
                           {:detail => detail, :label => label, :value => value, :old_value => old_value })
                 label ||= detail.prop_key
                 value ||= detail.value
                 old_value ||= detail.old_value
                 unless no_html
                   label = content_tag('strong', label)
                   old_value = content_tag("i", h(old_value)) if detail.old_value
                   if detail.old_value && detail.value.blank? && detail.property != 'relation'
                     old_value = content_tag("del", old_value)
                   end
                   if detail.property == 'attachment' && value.present? &&
                       atta = detail.journal.journalized.attachments.detect {|a| a.id == detail.prop_key.to_i}
                     # Link to the attachment if it has not been removed
                     value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
                     if options[:only_path] != false && (atta.is_text? || atta.is_image?)
                       value += ' '
                       value += link_to(l(:button_view),
                                        { :controller => 'attachments', :action => 'show',
                                          :id => atta, :filename => atta.filename },
                                        :class => 'icon-only icon-magnifier',
                                        :title => l(:button_view))
                     end
                   else
                     value = content_tag("i", h(value)) if value
                   end
                 end
                 if show_diff
                   s = l(:text_journal_changed_no_detail, :label => label)
                   unless no_html
                     diff_link = link_to 'diff',
                       diff_journal_url(detail.journal_id, :detail_id => detail.id, :only_path => options[:only_path]),
                       :title => l(:label_view_diff)
                     s << " (#{ diff_link })"
                   end
                   s.html_safe
                 elsif detail.value.present?
                   case detail.property
                   when 'attr', 'cf'
                     if detail.old_value.present?
                       l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe
                     elsif multiple
                       l(:text_journal_added, :label => label, :value => value).html_safe
                     else
                       l(:text_journal_set_to, :label => label, :value => value).html_safe
                     end
                   when 'attachment', 'relation'
                     l(:text_journal_added, :label => label, :value => value).html_safe
                   end
                 else
                   l(:text_journal_deleted, :label => label, :old => old_value).html_safe
                 end
               end
               # Find the name of an associated record stored in the field attribute
               def find_name_by_reflection(field, id)
                 unless id.present?
                   return nil
                 end
                 @detail_value_name_by_reflection ||= Hash.new do |hash, key|
                   association = Issue.reflect_on_association(key.first.to_sym)
                   name = nil
                   if association
                     record = association.klass.find_by_id(key.last)
                     if record
                       name = record.name.force_encoding('UTF-8')
                     end
                   end
                   hash[key] = name
                 end
                 @detail_value_name_by_reflection[[field, id]]
               end
               # Renders issue children recursively
               def render_api_issue_children(issue, api)
                 return if issue.leaf?
                 api.array :children do
                   issue.children.each do |child|
                     api.issue(:id => child.id) do
                       api.tracker(:id => child.tracker_id, :name => child.tracker.name) unless child.tracker.nil?
                       api.subject child.subject
                       render_api_issue_children(child, api)
                     end
                   end
                 end
               end
             end

app/views/activities/index.html.erb +2 -2

             <h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h2>
             <p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p>
             <div id="activity">
             <% @events_by_day.keys.sort.reverse.each do |day| %>
             <h3><%= format_activity_day(day) %></h3>
             <dl>
             <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
               <dt class="<%= e.event_type %> <%= "grouped" if in_group %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
               <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
               <span class="time"><%= format_time(e.event_datetime, false) %></span>
               <%= content_tag('span', e.project, :class => 'project') if @project.nil? || @project != e.project %>
               <%= link_to format_activity_title(e.event_title), e.event_url %>
               </dt>
               <dd class="<%= "grouped" if in_group %>"><span class="description"><%= format_activity_description(e.event_description) %></span>
               <span class="author"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %></span></dd>
             <% end -%>
             </dl>
             <% end -%>
             </div>
             <%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
             <span class="pagination">
               <ul class="pages">
                 <li class="previous page">
             <%= link_to("\xc2\xab " + l(:label_previous),
-                               params.merge(:from => @date_to - @days - 1),
+                               {:params => request.query_parameters.merge(:from => @date_to - @days - 1)},
                                :title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1)),
                                :accesskey => accesskey(:previous)) %>
                 </li><% unless @date_to >= User.current.today %><li class="next page">
             <%= link_to(l(:label_next) + " \xc2\xbb",
-                               params.merge(:from => @date_to + @days - 1),
+                               {:params => request.query_parameters.merge(:from => @date_to + @days - 1)},
                                :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1)),
                                :accesskey => accesskey(:next)) %><% end %>
                 </li>
               </ul>
             </span>
             &nbsp;
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %>
             <% end %>
             <% content_for :header_tags do %>
             <%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %>
             <% end %>
             <% content_for :sidebar do %>
             <%= form_tag({}, :method => :get) do %>
             <h3><%= l(:label_activity) %></h3>
             <ul>
             <% @activity.event_types.each do |t| %>
               <li>
                 <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
                 <label for="show_<%=t%>">
                   <%= link_to(l("label_#{t.singularize}_plural"),
                               {"show_#{t}" => 1, :user_id => params[:user_id], :from => params[:from]})%>
                 </label>
               </li>
             <% end %>
             </ul>
             <% if @project && @project.descendants.active.any? %>
                 <%= hidden_field_tag 'with_subprojects', 0, :id => nil %>
                 <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
             <% end %>
             <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
             <%= hidden_field_tag('from', params[:from]) unless params[:from].blank? %>
             <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => 'submit' %></p>
             <% end %>
             <% end %>
             <% html_title(l(:label_activity), @author) -%>

app/views/gantts/show.html.erb +2 -2

             <% @gantt.view = self %>
             <div class="contextual">
             <% if !@query.new_record? && @query.editable_by?(User.current) %>
               <%= link_to l(:button_edit), edit_query_path(@query, :gantt => 1), :class => 'icon icon-edit' %>
               <%= delete_link query_path(@query, :gantt => 1) %>
             <% end %>
             </div>
             <h2><%= @query.new_record? ? l(:label_gantt) : @query.name %></h2>
             <%= form_tag({:controller => 'gantts', :action => 'show',
                          :project_id => @project, :month => params[:month],
                          :year => params[:year], :months => params[:months]},
                          :method => :get, :id => 'query_form') do %>
             <%= hidden_field_tag 'set_filter', '1' %>
             <%= hidden_field_tag 'gantt', '1' %>
             <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
               <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
               <div style="<%= @query.new_record? ? "" : "display: none;" %>">
                 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
               </div>
             </fieldset>
             <fieldset id="options" class="collapsible collapsed">
               <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
               <div style="display: none;">
                 <table>
                   <tr>
                     <td>
                       <fieldset>
                         <legend><%= l(:label_related_issues) %></legend>
                         <label for="draw_relations">
                           <%= check_box 'query', 'draw_relations', :id => 'draw_relations' %>
                           <% rels = [IssueRelation::TYPE_BLOCKS, IssueRelation::TYPE_PRECEDES] %>
                           <% rels.each do |rel| %>
                             <% color = Redmine::Helpers::Gantt::DRAW_TYPES[rel][:color] %>
                             <%= content_tag(:span, '&nbsp;&nbsp;&nbsp;'.html_safe,
                                             :style => "background-color: #{color}") %>
                             <%= l(IssueRelation::TYPES[rel][:name]) %>
                           <% end %>
                         </label>
                       </fieldset>
                     </td>
                     <td>
                       <fieldset>
                         <legend><%= l(:label_gantt_progress_line) %></legend>
                         <label for="draw_progress_line">
                           <%= check_box 'query', 'draw_progress_line', :id => 'draw_progress_line' %>
                           <%= l(:label_display) %>
                         </label>
                       </fieldset>
                     </td>
                   </tr>
                 </table>
               </div>
             </fieldset>
             <p class="contextual">
               <%= gantt_zoom_link(@gantt, :in) %>
               <%= gantt_zoom_link(@gantt, :out) %>
             </p>
             <p class="buttons">
             <%= text_field_tag 'months', @gantt.months, :size => 2 %>
             <%= l(:label_months_from) %>
             <%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
             <%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %>
             <%= hidden_field_tag 'zoom', @gantt.zoom %>
             <%= link_to_function l(:button_apply), '$("#query_form").submit()',
                                  :class => 'icon icon-checked' %>
             <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
                         :class => 'icon icon-reload' %>
             <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
               <%= link_to_function l(:button_save),
                                    "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit();",
                                    :class => 'icon icon-save' %>
             <% end %>
             </p>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <%
               zoom = 1
               @gantt.zoom.times { zoom = zoom * 2 }
               subject_width = 330
               header_height = 18
               headers_height = header_height
               show_weeks = false
               show_days  = false
               show_day_num = false
               if @gantt.zoom > 1
                 show_weeks = true
                 headers_height = 2 * header_height
                 if @gantt.zoom > 2
                     show_days = true
                     headers_height = 3 * header_height
                     if @gantt.zoom > 3
                       show_day_num = true
                       headers_height = 4 * header_height
                     end
                 end
               end
               # Width of the entire chart
               g_width = ((@gantt.date_to - @gantt.date_from + 1) * zoom).to_i
               @gantt.render(:top => headers_height + 8,
                             :zoom => zoom,
                             :g_width => g_width,
                             :subject_width => subject_width)
               g_height = [(20 * (@gantt.number_of_rows + 6)) + 150, 206].max
               t_height = g_height + headers_height
             %>
             <% if @gantt.truncated %>
               <p class="warning"><%= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %></p>
             <% end %>
             <table style="width:100%; border:0; border-collapse: collapse;">
             <tr>
             <td style="width:<%= subject_width %>px; padding:0px;">
               <%
                 style  = ""
                 style += "position:relative;"
                 style += "height: #{t_height + 24}px;"
                 style += "width: #{subject_width + 1}px;"
               %>
               <%= content_tag(:div, :style => style) do %>
                 <%
                   style  = ""
                   style += "right:-2px;"
                   style += "width: #{subject_width}px;"
                   style += "height: #{headers_height}px;"
                   style += 'background: #eee;'
                 %>
                 <%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
                 <%
                   style  = ""
                   style += "right:-2px;"
                   style += "width: #{subject_width}px;"
                   style += "height: #{t_height}px;"
                   style += 'border-left: 1px solid #c0c0c0;'
                   style += 'overflow: hidden;'
                 %>
                 <%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
                 <%= content_tag(:div, :class => "gantt_subjects") do %>
                   <%= @gantt.subjects.html_safe %>
                 <% end %>
               <% end %>
             </td>
             <td>
             <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;" id="gantt_area">
             <%
               style  = ""
               style += "width: #{g_width - 1}px;"
               style += "height: #{headers_height}px;"
               style += 'background: #eee;'
             %>
             <%= content_tag(:div, '&nbsp;'.html_safe, :style => style, :class => "gantt_hdr") %>
             <% ###### Months headers ###### %>
             <%
               month_f = @gantt.date_from
               left = 0
               height = (show_weeks ? header_height : header_height + g_height)
             %>
             <% @gantt.months.times do %>
               <%
                 width = (((month_f >> 1) - month_f) * zoom - 1).to_i
                 style  = ""
                 style += "left: #{left}px;"
                 style += "width: #{width}px;"
                 style += "height: #{height}px;"
               %>
               <%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
                 <%= link_to "#{month_f.year}-#{month_f.month}",
                             @gantt.params.merge(:year => month_f.year, :month => month_f.month),
                             :title => "#{month_name(month_f.month)} #{month_f.year}" %>
               <% end %>
               <%
                 left = left + width + 1
                 month_f = month_f >> 1
               %>
             <% end %>
             <% ###### Weeks headers ###### %>
             <% if show_weeks %>
               <%
                 left = 0
                 height = (show_days ? header_height - 1 : header_height - 1 + g_height)
               %>
               <% if @gantt.date_from.cwday == 1 %>
                 <%
                   # @date_from is monday
                   week_f = @gantt.date_from
                 %>
               <% else %>
                 <%
                   # find next monday after @date_from
                   week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
                   width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
                   style  = ""
                   style += "left: #{left}px;"
                   style += "top: 19px;"
                   style += "width: #{width}px;"
                   style += "height: #{height}px;"
                 %>
                 <%= content_tag(:div, '&nbsp;'.html_safe,
                                 :style => style, :class => "gantt_hdr") %>
                 <% left = left + width + 1 %>
               <% end %>
               <% while week_f <= @gantt.date_to %>
                 <%
                   width = ((week_f + 6 <= @gantt.date_to) ?
 * zoom - 1 :
                               (@gantt.date_to - week_f + 1) * zoom - 1).to_i
                   style  = ""
                   style += "left: #{left}px;"
                   style += "top: 19px;"
                   style += "width: #{width}px;"
                   style += "height: #{height}px;"
                 %>
                 <%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
                   <%= content_tag(:small) do %>
                     <%= week_f.cweek if width >= 16 %>
                   <% end %>
                 <% end %>
                 <%
                   left = left + width + 1
                   week_f = week_f + 7
                 %>
               <% end %>
             <% end %>
             <% ###### Day numbers headers ###### %>
             <% if show_day_num %>
               <%
                 left = 0
                 height = g_height + header_height*2 - 1
                 wday = @gantt.date_from.cwday
                 day_num = @gantt.date_from
               %>
               <% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %>
                 <%
                   width =  zoom - 1
                   style = ""
                   style += "left:#{left}px;"
                   style += "top:37px;"
                   style += "width:#{width}px;"
                   style += "height:#{height}px;"
                   style += "font-size:0.7em;"
                   clss = "gantt_hdr"
                   clss << " nwday" if @gantt.non_working_week_days.include?(wday)
                 %>
                 <%= content_tag(:div, :style => style, :class => clss) do %>
                   <%= day_num.day %>
                 <% end %>
                 <%
                  left = left + width+1
                  day_num = day_num + 1
                  wday = wday + 1
                  wday = 1 if wday > 7
                 %>
               <% end %>
             <% end %>
             <% ###### Days headers ####### %>
             <% if show_days %>
               <%
                 left = 0
                 height = g_height + header_height - 1
                 top = (show_day_num ? 55 : 37)
                 wday = @gantt.date_from.cwday
               %>
               <% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %>
                 <%
                   width =  zoom - 1
                   style  = ""
                   style += "left: #{left}px;"
                   style += "top: #{top}px;"
                   style += "width: #{width}px;"
                   style += "height: #{height}px;"
                   style += "font-size:0.7em;"
                   clss = "gantt_hdr"
                   clss << " nwday" if @gantt.non_working_week_days.include?(wday)
                 %>
                 <%= content_tag(:div, :style => style, :class => clss) do %>
                   <%= day_letter(wday) %>
                 <% end %>
                 <%
                   left = left + width + 1
                   wday = wday + 1
                   wday = 1 if wday > 7
                 %>
               <% end %>
             <% end %>
             <%= @gantt.lines.html_safe %>
             <% ###### Today red line (excluded from cache) ###### %>
             <% if User.current.today >= @gantt.date_from and User.current.today <= @gantt.date_to %>
               <%
                 today_left = (((User.current.today - @gantt.date_from + 1) * zoom).floor() - 1).to_i
                 style  = ""
                 style += "position: absolute;"
                 style += "height: #{g_height}px;"
                 style += "top: #{headers_height + 1}px;"
                 style += "left: #{today_left}px;"
                 style += "width:10px;"
                 style += "border-left: 1px dashed red;"
               %>
               <%= content_tag(:div, '&nbsp;'.html_safe, :style => style, :id => 'today_line') %>
             <% end %>
             <%
               style  = ""
               style += "position: absolute;"
               style += "height: #{g_height}px;"
               style += "top: #{headers_height + 1}px;"
               style += "left: 0px;"
               style += "width: #{g_width - 1}px;"
             %>
             <%= content_tag(:div, '', :style => style, :id => "gantt_draw_area") %>
             </div>
             </td>
             </tr>
             </table>
             <table style="width:100%">
             <tr>
               <td style="text-align:left;">
                 <%= link_to("\xc2\xab " + l(:label_previous),
-                                           params.merge(@gantt.params_previous),
+                                           {:params => request.query_parameters.merge(@gantt.params_previous)},
                                            :accesskey => accesskey(:previous)) %>
               </td>
               <td style="text-align:right;">
                 <%= link_to(l(:label_next) + " \xc2\xbb",
-                                           params.merge(@gantt.params_next),
+                                           {:params => request.query_parameters.merge(@gantt.params_next)},
                                            :accesskey => accesskey(:next)) %>
               </td>
             </tr>
             </table>
             <% other_formats_links do |f| %>
               <%= f.link_to 'PDF', :url => params.merge(@gantt.params) %>
               <%= f.link_to('PNG', :url => params.merge(@gantt.params)) if @gantt.respond_to?('to_image') %>
             <% end %>
             <% end # query.valid? %>
             <% content_for :sidebar do %>
               <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% html_title(l(:label_gantt)) -%>
             <% content_for :header_tags do %>
               <%= javascript_include_tag 'raphael' %>
               <%= javascript_include_tag 'gantt' %>
             <% end %>
             <%= javascript_tag do %>
               var issue_relation_type = <%= raw Redmine::Helpers::Gantt::DRAW_TYPES.to_json %>;
               $(document).ready(drawGanttHandler);
               $(window).resize(drawGanttHandler);
               $(function() {
                 $("#draw_relations").change(drawGanttHandler);
                 $("#draw_progress_line").change(drawGanttHandler);
               });
             <% 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