jro_apps/redmine Commit - r11221:1ac8fd8c4214

Adds helpers for query columns selection....

Jean-Philippe Lang -

r11221:1ac8fd8c4214

parent child

Context file:

r11221:1ac8fd8c4214

Collapse all files

app/controllers/settings_controller.rb +2 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  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 SettingsController < ApplicationController
               layout 'admin'
               menu_item :plugins, :only => :plugin
+              helper :queries
               before_filter :require_admin
               def index
                 edit
                 render :action => 'edit'
               end
               def edit
                 @notifiables = Redmine::Notifiable.all
                 if request.post? && params[:settings] && params[:settings].is_a?(Hash)
                   settings = (params[:settings] || {}).dup.symbolize_keys
                   settings.each do |name, value|
                     # remove blank values in array settings
                     value.delete_if {|v| v.blank? } if value.is_a?(Array)
                     Setting[name] = value
                   end
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to settings_path(:tab => params[:tab])
                 else
                   @options = {}
                   user_format = User::USER_FORMATS.collect{|key, value| [key, value[:setting_order]]}.sort{|a, b| a[1] <=> b[1]}
                   @options[:user_format] = user_format.collect{|f| [User.current.name(f[0]), f[0].to_s]}
                   @deliveries = ActionMailer::Base.perform_deliveries
                   @guessed_host_and_path = request.host_with_port.dup
                   @guessed_host_and_path << ('/'+ Redmine::Utils.relative_url_root.gsub(%r{^\/}, '')) unless Redmine::Utils.relative_url_root.blank?
                   Redmine::Themes.rescan
                 end
               end
               def plugin
                 @plugin = Redmine::Plugin.find(params[:id])
                 unless @plugin.configurable?
                   render_404
                   return
                 end
                 if request.post?
                   Setting.send "plugin_#{@plugin.id}=", params[:settings]
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to plugin_settings_path(@plugin)
                 else
                   @partial = @plugin.settings[:partial]
                   @settings = Setting.send "plugin_#{@plugin.id}"
                 end
               rescue Redmine::PluginNotFound
                 render_404
               end
             end

app/helpers/queries_helper.rb +8 0

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module QueriesHelper
               def filters_options_for_select(query)
                 options_for_select(filters_options(query))
               end
               def filters_options(query)
                 options = [[]]
                 options += query.available_filters.map do |field, field_options|
                   [field_options[:name], field]
                 end
               end
               def available_block_columns_tags(query)
                 tags = ''.html_safe
                 query.available_block_columns.each do |column|
                   tags << content_tag('label', check_box_tag('c[]', column.name.to_s, query.has_column?(column)) + " #{column.caption}", :class => 'inline')
                 end
                 tags
               end
+              def query_available_inline_columns_options(query)
+                (query.available_inline_columns - query.columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}
+              end
+              def query_selected_inline_columns_options(query)
+                (query.inline_columns & query.available_inline_columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}
+              end
               def column_header(column)
                 column.sortable ? sort_header_tag(column.name.to_s, :caption => column.caption,
                                                                     :default_order => column.default_order) :
                                   content_tag('th', h(column.caption))
               end
               def column_content(column, issue)
                 value = column.value(issue)
                 if value.is_a?(Array)
                   value.collect {|v| column_value(column, issue, v)}.compact.join(', ').html_safe
                 else
                   column_value(column, issue, value)
                 end
               end
               def column_value(column, issue, value)
                 case value.class.name
                 when 'String'
                   if column.name == :subject
                     link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
                   elsif column.name == :description
                     issue.description? ? content_tag('div', textilizable(issue, :description), :class => "wiki") : ''
                   else
                     h(value)
                   end
                 when 'Time'
                   format_time(value)
                 when 'Date'
                   format_date(value)
                 when 'Fixnum'
                   if column.name == :id
                     link_to value, issue_path(issue)
                   elsif column.name == :done_ratio
                     progress_bar(value, :width => '80px')
                   else
                     value.to_s
                   end
                 when 'Float'
                   sprintf "%.2f", value
                 when 'User'
                   link_to_user value
                 when 'Project'
                   link_to_project value
                 when 'Version'
                   link_to(h(value), :controller => 'versions', :action => 'show', :id => value)
                 when 'TrueClass'
                   l(:general_text_Yes)
                 when 'FalseClass'
                   l(:general_text_No)
                 when 'Issue'
                   value.visible? ? link_to_issue(value) : "##{value.id}"
                 when 'IssueRelation'
                   other = value.other_issue(issue)
                   content_tag('span',
                     (l(value.label_for(issue)) + " " + link_to_issue(other, :subject => false, :tracker => false)).html_safe,
                     :class => value.css_classes_for(issue))
                 else
                   h(value)
                 end
               end
               def csv_content(column, issue)
                 value = column.value(issue)
                 if value.is_a?(Array)
                   value.collect {|v| csv_value(column, issue, v)}.compact.join(', ')
                 else
                   csv_value(column, issue, value)
                 end
               end
               def csv_value(column, issue, value)
                 case value.class.name
                 when 'Time'
                   format_time(value)
                 when 'Date'
                   format_date(value)
                 when 'Float'
                   sprintf("%.2f", value).gsub('.', l(:general_csv_decimal_separator))
                 when 'IssueRelation'
                   other = value.other_issue(issue)
                   l(value.label_for(issue)) + " ##{other.id}"
                 else
                   value.to_s
                 end
               end
               def query_to_csv(items, query, options={})
                 encoding = l(:general_csv_encoding)
                 columns = (options[:columns] == 'all' ? query.available_inline_columns : query.inline_columns)
                 query.available_block_columns.each do |column|
                   if options[column.name].present?
                     columns << column
                   end
                 end
                 export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
                   # csv header fields
                   csv << columns.collect {|c| Redmine::CodesetUtil.from_utf8(c.caption.to_s, encoding) }
                   # csv lines
                   items.each do |item|
                     csv << columns.collect {|c| Redmine::CodesetUtil.from_utf8(csv_content(c, item), encoding) }
                   end
                 end
                 export
               end
               # Retrieve query from session or build a new query
               def retrieve_query
                 if !params[:query_id].blank?
                   cond = "project_id IS NULL"
                   cond << " OR project_id = #{@project.id}" if @project
                   @query = IssueQuery.find(params[:query_id], :conditions => cond)
                   raise ::Unauthorized unless @query.visible?
                   @query.project = @project
                   session[:query] = {:id => @query.id, :project_id => @query.project_id}
                   sort_clear
                 elsif api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
                   # Give it a name, required to be valid
                   @query = IssueQuery.new(:name => "_")
                   @query.project = @project
                   @query.build_from_params(params)
                   session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names}
                 else
                   # retrieve from session
                   @query = IssueQuery.find_by_id(session[:query][:id]) if session[:query][:id]
                   @query ||= IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
                   @query.project = @project
                 end
               end
               def retrieve_query_from_session
                 if session[:query]
                   if session[:query][:id]
                     @query = IssueQuery.find_by_id(session[:query][:id])
                     return unless @query
                   else
                     @query = IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
                   end
                   if session[:query].has_key?(:project_id)
                     @query.project_id = session[:query][:project_id]
                   else
                     @query.project = @project
                   end
                   @query
                 end
               end
             end

app/views/queries/_columns.html.erb +2 -2

             <table class="query-columns">
               <tr>
                 <td style="padding-left:0">
                   <%= label_tag "available_columns", l(:description_available_columns) %>
                   <br />
                   <%= select_tag 'available_columns',
-                          options_for_select((query.available_inline_columns - query.columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}),
+                          options_for_select(query_available_inline_columns_options(query)),
                           :multiple => true, :size => 10, :style => "width:150px",
                           :ondblclick => "moveOptions(this.form.available_columns, this.form.selected_columns);" %>
                 </td>
                 <td class="buttons">
                   <input type="button" value="&#8594;"
                    onclick="moveOptions(this.form.available_columns, this.form.selected_columns);" /><br />
                   <input type="button" value="&#8592;"
                    onclick="moveOptions(this.form.selected_columns, this.form.available_columns);" />
                 </td>
                 <td>
                   <%= label_tag "selected_columns", l(:description_selected_columns) %>
                   <br />
                   <%= select_tag((defined?(tag_name) ? tag_name : 'c[]'),
-                          options_for_select((query.inline_columns & query.available_inline_columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}),
+                          options_for_select(query_selected_inline_columns_options(query)),
                           :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px",
                           :ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);") %>
                 </td>
                 <td class="buttons">
                   <input type="button" value="&#8593;" onclick="moveOptionUp(this.form.selected_columns);" /><br />
                   <input type="button" value="&#8595;" onclick="moveOptionDown(this.form.selected_columns);" />
                 </td>
               </tr>
             </table>
             <% content_for :header_tags do %>
             <%= javascript_include_tag 'select_list_move' %>
             <% 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