jro_apps/redmine Commit - r15133:3bd4124ab2b0

Merged r15510 (#22123)....

Jean-Philippe Lang -

r15133:3bd4124ab2b0

parent child

Context file:

r15133:3bd4124ab2b0

Collapse all files

app/helpers/queries_helper.rb +1 0

             # 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 QueriesHelper
               include ApplicationHelper
               def filters_options_for_select(query)
                 ungrouped = []
                 grouped = {}
                 query.available_filters.map do |field, field_options|
                   if [:tree, :relation].include?(field_options[:type])
                     group = :label_related_issues
                   elsif field =~ /^(.+)\./
                     # association filters
                     group = "field_#{$1}"
                   elsif %w(member_of_group assigned_to_role).include?(field)
                     group = :field_assigned_to
                   elsif field_options[:type] == :date_past || field_options[:type] == :date
                     group = :label_date
                   end
                   if group
                     (grouped[group] ||= []) << [field_options[:name], field]
                   else
                     ungrouped << [field_options[:name], field]
                   end
                 end
                 # Don't group dates if there's only one (eg. time entries filters)
                 if grouped[:label_date].try(:size) == 1
                   ungrouped << grouped.delete(:label_date).first
                 end
                 s = options_for_select([[]] + ungrouped)
                 if grouped.present?
                   localized_grouped = grouped.map {|k,v| [l(k), v]}
                   s << grouped_options_for_select(localized_grouped)
                 end
                 s
               end
               def query_filters_hidden_tags(query)
                 tags = ''.html_safe
                 query.filters.each do |field, options|
                   tags << hidden_field_tag("f[]", field, :id => nil)
                   tags << hidden_field_tag("op[#{field}]", options[:operator], :id => nil)
                   options[:values].each do |value|
                     tags << hidden_field_tag("v[#{field}][]", value, :id => nil)
                   end
                 end
                 tags
               end
               def query_columns_hidden_tags(query)
                 tags = ''.html_safe
                 query.columns.each do |column|
                   tags << hidden_field_tag("c[]", column.name, :id => nil)
                 end
                 tags
               end
               def query_hidden_tags(query)
                 query_filters_hidden_tags(query) + query_columns_hidden_tags(query)
               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), :id => nil) + " #{column.caption}", :class => 'inline')
                 end
                 tags
               end
               def available_totalable_columns_tags(query)
                 tags = ''.html_safe
                 query.available_totalable_columns.each do |column|
                   tags << content_tag('label', check_box_tag('t[]', column.name.to_s, query.totalable_columns.include?(column), :id => nil) + " #{column.caption}", :class => 'inline')
                 end
+                tags << hidden_field_tag('t[]', '')
                 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 render_query_columns_selection(query, options={})
                 tag_name = (options[:name] || 'c') + '[]'
                 render :partial => 'queries/columns', :locals => {:query => query, :tag_name => tag_name}
               end
               def render_query_totals(query)
                 return unless query.totalable_columns.present?
                 totals = query.totalable_columns.map do |column|
                   total_tag(column, query.total_for(column))
                 end
                 content_tag('p', totals.join(" ").html_safe, :class => "query-totals")
               end
               def total_tag(column, value)
                 label = content_tag('span', "#{column.caption}:")
                 value = content_tag('span', format_object(value), :class => 'value')
                 content_tag('span', label + " " + value, :class => "total-for-#{column.name.to_s.dasherize}")
               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_object(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 column.name
                 when :id
                   link_to value, issue_path(issue)
                 when :subject
                   link_to value, issue_path(issue)
                 when :parent
                   value ? (value.visible? ? link_to_issue(value, :subject => false) : "##{value.id}") : ''
                 when :description
                   issue.description? ? content_tag('div', textilizable(issue, :description), :class => "wiki") : ''
                 when :done_ratio
                   progress_bar(value)
                 when :relations
                   content_tag('span',
                     value.to_s(issue) {|other| link_to_issue(other, :subject => false, :tracker => false)}.html_safe,
                     :class => value.css_classes_for(issue))
                 else
                   format_object(value)
                 end
               end
               def csv_content(column, issue)
                 value = column.value_object(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, object, value)
                 format_object(value, false) do |value|
                   case value.class.name
                   when 'Float'
                     sprintf("%.2f", value).gsub('.', l(:general_csv_decimal_separator))
                   when 'IssueRelation'
                     value.to_s(object)
                   when 'Issue'
                     if object.is_a?(TimeEntry)
                       "#{value.tracker} ##{value.id}: #{value.subject}"
                     else
                       value.id
                     end
                   else
                     value
                   end
                 end
               end
               def query_to_csv(items, query, options={})
                 options ||= {}
                 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
                 Redmine::Export::CSV.generate do |csv|
                   # csv header fields
                   csv << columns.map {|c| c.caption.to_s}
                   # csv lines
                   items.each do |item|
                     csv << columns.map {|c| csv_content(c, item)}
                   end
                 end
               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.where(cond).find(params[:query_id])
                   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, :totalable_names => @query.totalable_names}
                 else
                   # retrieve from session
                   @query = nil
                   @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], :totalable_names => session[:query][:totalable_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], :totalable_names => session[:query][:totalable_names])
                   end
                   if session[:query].has_key?(:project_id)
                     @query.project_id = session[:query][:project_id]
                   else
                     @query.project = @project
                   end
                   @query
                 end
               end
               # Returns the query definition as hidden field tags
               def query_as_hidden_field_tags(query)
                 tags = hidden_field_tag("set_filter", "1", :id => nil)
                 if query.filters.present?
                   query.filters.each do |field, filter|
                     tags << hidden_field_tag("f[]", field, :id => nil)
                     tags << hidden_field_tag("op[#{field}]", filter[:operator], :id => nil)
                     filter[:values].each do |value|
                       tags << hidden_field_tag("v[#{field}][]", value, :id => nil)
                     end
                   end
                 end
                 if query.column_names.present?
                   query.column_names.each do |name|
                     tags << hidden_field_tag("c[]", name, :id => nil)
                   end
                 end
                 if query.totalable_names.present?
                   query.totalable_names.each do |name|
                     tags << hidden_field_tag("t[]", name, :id => nil)
                   end
                 end
                 if query.group_by.present?
                   tags << hidden_field_tag("group_by", query.group_by, :id => nil)
                 end
                 tags
               end
             end

test/ui/issues_test_ui.rb +20 0

             # 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.
             require File.expand_path('../base', __FILE__)
             class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
               fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
                        :trackers, :projects_trackers, :enabled_modules, :issue_statuses, :issues,
                        :enumerations, :custom_fields, :custom_values, :custom_fields_trackers,
                        :watchers, :journals, :journal_details
               def test_create_issue
                 log_user('jsmith', 'jsmith')
                 visit '/projects/ecookbook/issues/new'
                 within('form#issue-form') do
                   select 'Bug', :from => 'Tracker'
                   select 'Low', :from => 'Priority'
                   fill_in 'Subject', :with => 'new test issue'
                   fill_in 'Description', :with => 'new issue'
                   select '0 %', :from => 'Done'
                   fill_in 'Due date', :with => ''
                   fill_in 'Searchable field', :with => 'Value for field 2'
                   # click_button 'Create' would match both 'Create' and 'Create and continue' buttons
                   find('input[name=commit]').click
                 end
                 # find created issue
                 issue = Issue.find_by_subject("new test issue")
                 assert_kind_of Issue, issue
                 # check redirection
                 find 'div#flash_notice', :visible => true, :text => "Issue \##{issue.id} created."
                 assert_equal issue_path(:id => issue), current_path
                 # check issue attributes
                 assert_equal 'jsmith', issue.author.login
                 assert_equal 1, issue.project.id
                 assert_equal IssueStatus.find_by_name('New'), issue.status
                 assert_equal Tracker.find_by_name('Bug'), issue.tracker
                 assert_equal IssuePriority.find_by_name('Low'), issue.priority
                 assert_equal 'Value for field 2', issue.custom_field_value(CustomField.find_by_name('Searchable field'))
               end
               def test_create_issue_with_form_update
                 field1 = IssueCustomField.create!(
                   :field_format => 'string',
                   :name => 'Field1',
                   :is_for_all => true,
                   :trackers => Tracker.where(:id => [1, 2])
                 )
                 field2 = IssueCustomField.create!(
                   :field_format => 'string',
                   :name => 'Field2',
                   :is_for_all => true,
                   :trackers => Tracker.where(:id => 2)
                 )
                 Role.non_member.add_permission! :add_issues
                 Role.non_member.remove_permission! :edit_issues, :add_issue_notes
                 log_user('someone', 'foo')
                 visit '/projects/ecookbook/issues/new'
                 assert page.has_no_content?(field2.name)
                 assert page.has_content?(field1.name)
                 fill_in 'Subject', :with => 'New test issue'
                 fill_in 'Description', :with => 'New test issue description'
                 fill_in field1.name, :with => 'CF1 value'
                 select 'Low', :from => 'Priority'
                 # field2 should show up when changing tracker
                 select 'Feature request', :from => 'Tracker'
                 assert page.has_content?(field2.name)
                 assert page.has_content?(field1.name)
                 fill_in field2.name, :with => 'CF2 value'
                 assert_difference 'Issue.count' do
                   page.first(:button, 'Create').click
                 end
                 issue = Issue.order('id desc').first
                 assert_equal 'New test issue', issue.subject
                 assert_equal 'New test issue description', issue.description
                 assert_equal 'Low', issue.priority.name
                 assert_equal 'CF1 value', issue.custom_field_value(field1)
                 assert_equal 'CF2 value', issue.custom_field_value(field2)
               end
               def test_create_issue_with_watchers
                 user = User.generate!(:firstname => 'Some', :lastname => 'Watcher')
                 assert_equal 'Some Watcher', user.name
                 log_user('jsmith', 'jsmith')
                 visit '/projects/ecookbook/issues/new'
                 fill_in 'Subject', :with => 'Issue with watchers'
                 # Add a project member as watcher
                 check 'Dave Lopper'
                 # Search for another user
                 assert page.has_no_css?('form#new-watcher-form')
                 assert page.has_no_content?('Some Watcher')
                 click_link 'Search for watchers to add'
                 within('form#new-watcher-form') do
                   fill_in 'user_search', :with => 'watch'
                   assert page.has_content?('Some Watcher')
                   check 'Some Watcher'
                   click_button 'Add'
                 end
                 assert page.has_css?('form#issue-form')
                 assert page.has_css?('p#watchers_form')
                 using_wait_time(30) do
                   within('span#watchers_inputs') do
                     within("label#issue_watcher_user_ids_#{user.id}") do
                       assert has_content?('Some Watcher'), "No watcher content"
                     end
                   end
                 end
                 assert_difference 'Issue.count' do
                   find('input[name=commit]').click
                 end
                 issue = Issue.order('id desc').first
                 assert_equal ['Dave Lopper', 'Some Watcher'], issue.watcher_users.map(&:name).sort
               end
               def test_create_issue_start_due_date
                 with_settings :default_issue_start_date_to_creation_date => 0 do
                   log_user('jsmith', 'jsmith')
                   visit '/projects/ecookbook/issues/new'
                   assert_equal "", page.find('input#issue_start_date').value
                   assert_equal "", page.find('input#issue_due_date').value
                   page.first('p#start_date_area img').click
                   page.first("td.ui-datepicker-days-cell-over a").click
                   assert_equal Date.today.to_s, page.find('input#issue_start_date').value
                   page.first('p#due_date_area img').click
                   page.first("td.ui-datepicker-days-cell-over a").click
                   assert_equal Date.today.to_s, page.find('input#issue_due_date').value
                 end
               end
               def test_default_due_date_proposed_in_date_picker
                 log_user('jsmith', 'jsmith')
                 visit '/projects/ecookbook/issues/new'
                 # Future start date: due date should default to start date
                 fill_in 'Start date', :with => '2027-04-01'
                 fill_in 'Due date', :with => ''
                 page.first('p#due_date_area img').click
                 page.first("td.ui-datepicker-days-cell-over a").click
                 assert_equal '2027-04-01', page.find('input#issue_due_date').value
                 # Passed start date: due date should default to today
                 fill_in 'Start date', :with => '2012-04-01'
                 fill_in 'Due date', :with => ''
                 page.first('p#due_date_area img').click
                 page.first("td.ui-datepicker-days-cell-over a").click
                 assert_equal Date.today.to_s, page.find('input#issue_due_date').value
               end
               def test_default_start_date_proposed_in_date_picker
                 log_user('jsmith', 'jsmith')
                 visit '/projects/ecookbook/issues/new'
                 # Passed due date: start date should default to due date
                 fill_in 'Start date', :with => ''
                 fill_in 'Due date', :with => '2012-04-01'
                 page.first('p#start_date_area img').click
                 page.first("td.ui-datepicker-days-cell-over a").click
                 assert_equal '2012-04-01', page.find('input#issue_start_date').value
               end
               def test_preview_issue_description
                 log_user('jsmith', 'jsmith')
                 visit '/projects/ecookbook/issues/new'
                 within('form#issue-form') do
                   fill_in 'Subject', :with => 'new issue subject'
                   fill_in 'Description', :with => 'new issue description'
                   click_link 'Preview'
                 end
                 find 'div#preview fieldset', :visible => true, :text => 'new issue description'
                 assert_difference 'Issue.count' do
                   find('input[name=commit]').click
                 end
                 issue = Issue.order('id desc').first
                 assert_equal 'new issue description', issue.description
               end
               def test_update_issue_with_form_update
                 field = IssueCustomField.create!(
                   :field_format => 'string',
                   :name => 'Form update CF',
                   :is_for_all => true,
                   :trackers => Tracker.where(:name => 'Feature request')
                 )
                 Role.non_member.add_permission! :edit_issues
                 Role.non_member.remove_permission! :add_issues, :add_issue_notes
                 log_user('someone', 'foo')
                 visit '/issues/1'
                 assert page.has_no_content?('Form update CF')
                 page.first(:link, 'Edit').click
                 # the custom field should show up when changing tracker
                 select 'Feature request', :from => 'Tracker'
                 assert page.has_content?('Form update CF')
                 fill_in 'Form update', :with => 'CF value'
                 assert_no_difference 'Issue.count' do
                   page.first(:button, 'Submit').click
                 end
                 issue = Issue.find(1)
                 assert_equal 'CF value', issue.custom_field_value(field)
               end
               def test_remove_issue_watcher_from_sidebar
                 user = User.find(3)
                 Watcher.create!(:watchable => Issue.find(1), :user => user)
                 log_user('jsmith', 'jsmith')
                 visit '/issues/1'
                 assert page.first('#sidebar').has_content?('Watchers (1)')
                 assert page.first('#sidebar').has_content?(user.name)
                 assert_difference 'Watcher.count', -1 do
                   page.first('ul.watchers .user-3 a.delete').click
                   assert page.first('#sidebar').has_content?('Watchers (0)')
                 end
                 assert page.first('#sidebar').has_no_content?(user.name)
               end
               def test_watch_should_update_watchers_list
                 user = User.find(2)
                 log_user('jsmith', 'jsmith')
                 visit '/issues/1'
                 assert page.first('#sidebar').has_content?('Watchers (0)')
                 page.first('a.issue-1-watcher').click
                 assert page.first('#sidebar').has_content?('Watchers (1)')
                 assert page.first('#sidebar').has_content?(user.name)
               end
               def test_watch_issue_via_context_menu
                 log_user('jsmith', 'jsmith')
                 visit '/issues'
                 assert page.has_css?('tr#issue-1')
                 find('tr#issue-1 td.updated_on').click
                 page.execute_script "$('tr#issue-1 td.updated_on').trigger('contextmenu');"
                 assert_difference 'Watcher.count' do
                   within('#context-menu') do
                     click_link 'Watch'
                   end
                   # wait for ajax response
                   assert page.has_css?('#context-menu .issue-1-watcher.icon-fav')
                   assert page.has_css?('tr#issue-1')
                 end
                 assert Issue.find(1).watched_by?(User.find_by_login('jsmith'))
               end
               def test_bulk_watch_issues_via_context_menu
                 log_user('jsmith', 'jsmith')
                 visit '/issues'
                 assert page.has_css?('tr#issue-1')
                 assert page.has_css?('tr#issue-4')
                 find('tr#issue-1 input[type=checkbox]').click
                 find('tr#issue-4 input[type=checkbox]').click
                 page.execute_script "$('tr#issue-1 td.updated_on').trigger('contextmenu');"
                 assert_difference 'Watcher.count', 2 do
                   within('#context-menu') do
                     click_link 'Watch'
                   end
                   # wait for ajax response
                   assert page.has_css?('#context-menu .issue-bulk-watcher.icon-fav')
                   assert page.has_css?('tr#issue-1')
                   assert page.has_css?('tr#issue-4')
                 end
                 assert Issue.find(1).watched_by?(User.find_by_login('jsmith'))
                 assert Issue.find(4).watched_by?(User.find_by_login('jsmith'))
               end
+              def test_issue_list_with_default_totalable_columns
+                log_user('admin', 'admin')
+                with_settings :issue_list_default_totals => ['estimated_hours'] do
+                  visit '/projects/ecookbook/issues'
+                  # Check that the page shows the Estimated hours total
+                  assert page.has_css?('p.query-totals')
+                  assert page.has_css?('span.total-for-estimated-hours')
+                  # Open the Options of the form (necessary for having the totalable columns options clickable)
+                  page.all('legend')[1].click
+                  # Deselect the default totalable column (none should be left)
+                  page.first('input[name="t[]"][value="estimated_hours"]').click
+                  within('#query_form') do
+                    click_link 'Apply'
+                  end
+                  # Check that Totals are not present in the reloaded page
+                  assert !page.has_css?('p.query-totals')
+                  assert !page.has_css?('span.total-for-estimated-hours')
+                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