jro_apps/redmine Commit - r3494:79b4f681760e

0

app/controllers/projects_controller.rb +14 -12

@@ -115,18 +115,20 class ProjectsController < ApplicationController
115	redirect_to :controller => 'admin', :action => 'projects'	115	redirect_to :controller => 'admin', :action => 'projects'
116	end	116	end
117	else	117	else
118	@project = Project.new(params[:project])	118	Mailer.with_deliveries(params[:notifications] == '1') do
119	@project.enabled_module_names = params[:enabled_modules]	119	@project = Project.new(params[:project])
120	if validate_parent_id && @project.copy(@source_project, :only => params[:only])	120	@project.enabled_module_names = params[:enabled_modules]
121	@project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')	121	if validate_parent_id && @project.copy(@source_project, :only => params[:only])
122	flash[:notice] = l(:notice_successful_create)	122	@project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
123	redirect_to :controller => 'admin', :action => 'projects'	123	flash[:notice] = l(:notice_successful_create)
124	elsif !@project.new_record?	124	redirect_to :controller => 'admin', :action => 'projects'
125	# Project was created	125	elsif !@project.new_record?
126	# But some objects were not copied due to validation failures	126	# Project was created
127	# (eg. issues from disabled trackers)	127	# But some objects were not copied due to validation failures
128	# TODO: inform about that	128	# (eg. issues from disabled trackers)
129	redirect_to :controller => 'admin', :action => 'projects'	129	# TODO: inform about that
		130	redirect_to :controller => 'admin', :action => 'projects'
		131	end
130	end	132	end
131	end	133	end
132	rescue ActiveRecord::RecordNotFound	134	rescue ActiveRecord::RecordNotFound

0

app/models/mailer.rb +9 0

@@ -324,6 +324,15 class Mailer < ActionMailer::Base
324	deliver_reminder(assignee, issues, days) unless assignee.nil?	324	deliver_reminder(assignee, issues, days) unless assignee.nil?
325	end	325	end
326	end	326	end
		327
		328	# Activates/desactivates email deliveries during +block+
		329	def self.with_deliveries(enabled = true, &block)
		330	was_enabled = ActionMailer::Base.perform_deliveries
		331	ActionMailer::Base.perform_deliveries = !!enabled
		332	yield
		333	ensure
		334	ActionMailer::Base.perform_deliveries = was_enabled
		335	end
327		336
328	private	337	private
329	def initialize_defaults(method_name)	338	def initialize_defaults(method_name)

0

app/views/projects/copy.rhtml +2 0

               <label class="block"><%= check_box_tag 'only[]', 'boards', true %> <%= l(:label_board_plural) %> (<%= @source_project.boards.count %>)</label>
               <label class="block"><%= check_box_tag 'only[]', 'wiki', true %> <%= l(:label_wiki_page_plural) %> (<%= @source_project.wiki.nil? ? 0 : @source_project.wiki.pages.count %>)</label>
               <%= hidden_field_tag 'only[]', '' %>
+              <br />
+            	<label class="block"><%= check_box_tag 'notifications', 1, params[:notifications] %> <%= l(:label_project_copy_notifications) %></label>
             </fieldset>
             <%= submit_tag l(:button_copy) %>

0

config/locales/bg.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/bs.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/ca.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/cs.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/da.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/de.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/el.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/en.yml +1 0

               label_api_access_key_created_on: "API access key created {{value}} ago"
               label_profile: Profile
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy
               button_login: Login
               button_submit: Submit

0

config/locales/es.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/eu.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/fi.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/fr.yml +1 0

               label_revision_id: Revision {{value}}
               label_profile: Profil
               label_subtask_plural: Sous-tâches
+              label_project_copy_notifications: Envoyer les notifications durant la copie du projet
               button_login: Connexion
               button_submit: Soumettre

0

config/locales/gl.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/he.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/hr.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/hu.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/id.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/it.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/ja.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/ko.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/lt.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/nl.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/no.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/pl.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/pt-BR.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/pt.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/ro.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/ru.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/sk.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/sl.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/sr.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/sv.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/th.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/tr.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/uk.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/vi.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/zh-TW.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

config/locales/zh.yml +1 0

               permission_manage_subtasks: Manage subtasks
               field_parent_issue: Parent task
               label_subtask_plural: Subtasks
+              label_project_copy_notifications: Send email notifications during the project copy

0

test/unit/mailer_test.rb +17 0

@@ -338,6 +338,14 class MailerTest < ActiveSupport::TestCase
338	end	338	end
339	end	339	end
340		340
		341	def test_test
		342	user = User.find(1)
		343	valid_languages.each do \|lang\|
		344	user.update_attribute :language, lang.to_s
		345	assert Mailer.deliver_test(user)
		346	end
		347	end
		348
341	def test_reminders	349	def test_reminders
342	Mailer.reminders(:days => 42)	350	Mailer.reminders(:days => 42)
343	assert_equal 1, ActionMailer::Base.deliveries.size	351	assert_equal 1, ActionMailer::Base.deliveries.size
@@ -365,4 +373,13 class MailerTest < ActiveSupport::TestCase
365		373
366	assert_equal :it, current_language	374	assert_equal :it, current_language
367	end	375	end
		376
		377	def test_with_deliveries_off
		378	Mailer.with_deliveries false do
		379	Mailer.deliver_test(User.find(1))
		380	end
		381	assert ActionMailer::Base.deliveries.empty?
		382	# should restore perform_deliveries
		383	assert ActionMailer::Base.perform_deliveries
		384	end
368	end	385	end

	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