jro_apps/redmine Commit - r3203:c5a59aff5b04

Merged r3305, r3306, r3307, r3311 from trunk....

Jean-Philippe Lang -

r3203:c5a59aff5b04

parent child

Context file:

r3203:c5a59aff5b04

Collapse all files

app/controllers/issues_controller.rb +15 -15

@@ -187,22 +187,22 class IssuesController < ApplicationController
187	if request.post?	187	if request.post?
188	@time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)	188	@time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
189	@time_entry.attributes = params[:time_entry]	189	@time_entry.attributes = params[:time_entry]
190	attachments = attach_files(@issue, params[:attachments])	190	if (@time_entry.hours.nil? \|\| @time_entry.valid?) && @issue.valid?
191	attachments.each {\|a\| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}	191	attachments = attach_files(@issue, params[:attachments])
192		192	attachments.each {\|a\| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
193	call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal})	193	call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal})
194		194	if @issue.save
195	if (@time_entry.hours.nil? \|\| @time_entry.valid?) && @issue.save	195	# Log spend time
196	# Log spend time	196	if User.current.allowed_to?(:log_time, @project)
197	if User.current.allowed_to?(:log_time, @project)	197	@time_entry.save
198	~~@time_entry~~.~~save~~	198	end
199	end	199	if !journal.new_record?
200	if !journal.new_record?	200	# Only send notification if something was actually changed
201	# Only send notification if something was actually changed	201	flash[:notice] = l(:notice_successful_update)
202	flash[:notice] = l(:notice_successful_update)	202	end
		203	call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal})
		204	redirect_back_or_default({:action => 'show', :id => @issue})
203	end	205	end
204	call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal})
205	redirect_back_or_default({:action => 'show', :id => @issue})
206	end	206	end
207	end	207	end
208	rescue ActiveRecord::StaleObjectError	208	rescue ActiveRecord::StaleObjectError

app/controllers/search_controller.rb +2 -2

                 # extract tokens from the question
                 # eg. hello "bye bye" => ["hello", "bye bye"]
                 @tokens = @question.scan(%r{((\s|^)"[\s\w]+"(\s|$)|\S+)}).collect {|m| m.first.gsub(%r{(^\s*"\s*|\s*"\s*$)}, '')}
-                # tokens must be at least 3 character long
+                # tokens must be at least 2 characters long
-                @tokens = @tokens.uniq.select {|w| w.length > 2 }
+                @tokens = @tokens.uniq.select {|w| w.length > 1 }
                 if !@tokens.empty?
                   # no more than 5 tokens to search for

app/helpers/issues_helper.rb +2 -2

                     c = IssueCategory.find_by_id(detail.value) and value = c.name if detail.value
                     c = IssueCategory.find_by_id(detail.old_value) and old_value = c.name if detail.old_value
                   when 'fixed_version_id'
-                    v = Version.find_by_id(detail.value) and value = format_version_name(v) if detail.value
+                    v = Version.find_by_id(detail.value) and value = v.name if detail.value
-                    v = Version.find_by_id(detail.old_value) and old_value = format_version_name(v) if detail.old_value
+                    v = Version.find_by_id(detail.old_value) and old_value = v.name if detail.old_value
                   when 'estimated_hours'
                     value = "%0.02f" % detail.value.to_f unless detail.value.blank?
                     old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?

app/models/mailer.rb +2 0

               # Overrides default deliver! method to prevent from sending an email
               # with no recipient, cc or bcc
               def deliver!(mail = @mail)
+                set_language_if_valid @initial_language
                 return false if (recipients.nil? || recipients.empty?) &&
                                 (cc.nil? || cc.empty?) &&
                                 (bcc.nil? || bcc.empty?)
               private
               def initialize_defaults(method_name)
                 super
+                @initial_language = current_language
                 set_language_if_valid Setting.default_language
                 from Setting.mail_from

test/unit/mailer_test.rb +15 -1

@@ -20,7 +20,7 require File.dirname(__FILE__) + '/../test_helper'
20	class MailerTest < ActiveSupport::TestCase	20	class MailerTest < ActiveSupport::TestCase
21	include Redmine::I18n	21	include Redmine::I18n
22	include ActionController::Assertions::SelectorAssertions	22	include ActionController::Assertions::SelectorAssertions
23	fixtures :projects, :issues, :users, :members, :member_roles, :documents, :attachments, :news, :tokens, :journals, :journal_details, :changesets, :trackers, :issue_statuses, :enumerations, :messages, :boards, :repositories	23	fixtures :projects, :enabled_modules, :issues, :users, :members, :member_roles, :roles, :documents, :attachments, :news, :tokens, :journals, :journal_details, :changesets, :trackers, :issue_statuses, :enumerations, :messages, :boards, :repositories
24		24
25	def test_generated_links_in_emails	25	def test_generated_links_in_emails
26	ActionMailer::Base.deliveries.clear	26	ActionMailer::Base.deliveries.clear
@@ -296,4 +296,18 class MailerTest < ActiveSupport::TestCase
296	assert_not_nil mail	296	assert_not_nil mail
297	mail	297	mail
298	end	298	end
		299
		300	def test_mailer_should_not_change_locale
		301	Setting.default_language = 'en'
		302	# Set current language to italian
		303	set_language_if_valid 'it'
		304	# Send an email to a french user
		305	user = User.find(1)
		306	user.language = 'fr'
		307	Mailer.deliver_account_activated(user)
		308	mail = ActionMailer::Base.deliveries.last
		309	assert mail.body.include?('Votre compte')
		310
		311	assert_equal :it, current_language
		312	end
299	end	313	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