jro_apps/redmine Commit - r193:2d47a6d71c09

app/views/mailer/attachments_add_de.rhtml created 644 +6 0

@@ -0,0 +1,6
	1	<%= @added_to %>
	2	<%= @attachments.size %> files(s) added.
	3	<% @attachments.each do \|attachment \| %>
	4	- <%= attachment.filename %><% end %>
	5
	6	<%= @url %> No newline at end of file

app/views/mailer/attachments_add_en.rhtml created 644 +6 0

@@ -0,0 +1,6
	1	<%= @added_to %>
	2	<%= @attachments.size %> files(s) added.
	3	<% @attachments.each do \|attachment \| %>
	4	- <%= attachment.filename %><% end %>
	5
	6	<%= @url %> No newline at end of file

app/views/mailer/attachments_add_es.rhtml created 644 +6 0

@@ -0,0 +1,6
	1	<%= @added_to %>
	2	<%= @attachments.size %> files(s) added.
	3	<% @attachments.each do \|attachment \| %>
	4	- <%= attachment.filename %><% end %>
	5
	6	<%= @url %> No newline at end of file

app/views/mailer/attachments_add_fr.rhtml created 644 +6 0

@@ -0,0 +1,6
	1	<%= @added_to %>
	2	<%= @attachments.size %> fichier(s) ajouté(s).
	3	<% @attachments.each do \|attachment \| %>
	4	- <%= attachment.filename %><% end %>
	5
	6	<%= @url %> No newline at end of file

app/views/mailer/document_add_de.rhtml created 644 +4 0

@@ -0,0 +1,4
	1	A document has been added to <%= @document.project.name %> (<%= @document.category.name %>):
	2	<%= l(:field_title) %>: <%= @document.title %>
	3
	4	http://<%= Setting.host_name %>/documents/show/<%= @document.id %> No newline at end of file

app/views/mailer/document_add_en.rhtml created 644 +4 0

@@ -0,0 +1,4
	1	A document has been added to <%= @document.project.name %> (<%= @document.category.name %>):
	2	<%= l(:field_title) %>: <%= @document.title %>
	3
	4	http://<%= Setting.host_name %>/documents/show/<%= @document.id %> No newline at end of file

app/views/mailer/document_add_es.rhtml created 644 +4 0

@@ -0,0 +1,4
	1	A document has been added to <%= @document.project.name %> (<%= @document.category.name %>):
	2	<%= l(:field_title) %>: <%= @document.title %>
	3
	4	http://<%= Setting.host_name %>/documents/show/<%= @document.id %> No newline at end of file

app/views/mailer/document_add_fr.rhtml created 644 +4 0

@@ -0,0 +1,4
	1	Un document a été ajouté à <%= @document.project.name %> (<%= @document.category.name %>):
	2	<%= l(:field_title) %>: <%= @document.title %>
	3
	4	http://<%= Setting.host_name %>/documents/show/<%= @document.id %> No newline at end of file

db/migrate/018_set_doc_and_files_notifications.rb created 644 +15 0

@@ -0,0 +1,15
	1	class SetDocAndFilesNotifications < ActiveRecord::Migration
	2	def self.up
	3	Permission.find_by_controller_and_action("projects", "add_file").update_attribute(:mail_option, true)
	4	Permission.find_by_controller_and_action("projects", "add_document").update_attribute(:mail_option, true)
	5	Permission.find_by_controller_and_action("documents", "add_attachment").update_attribute(:mail_option, true)
	6	Permission.find_by_controller_and_action("issues", "add_attachment").update_attribute(:mail_option, true)
	7	end
	8
	9	def self.down
	10	Permission.find_by_controller_and_action("projects", "add_file").update_attribute(:mail_option, false)
	11	Permission.find_by_controller_and_action("projects", "add_document").update_attribute(:mail_option, false)
	12	Permission.find_by_controller_and_action("documents", "add_attachment").update_attribute(:mail_option, false)
	13	Permission.find_by_controller_and_action("issues", "add_attachment").update_attribute(:mail_option, false)
	14	end
	15	end

app/controllers/documents_controller.rb +7 -3

             # redMine - project management software
-            # Copyright (C) 2006  Jean-Philippe Lang
+            # Copyright (C) 2006-2007  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
               def add_attachment
                 # Save the attachments
-                params[:attachments].each { |a|
+                @attachments = []
-                  Attachment.create(:container => @document, :file => a, :author => logged_in_user) unless a.size == 0
+                params[:attachments].each { |file|
+                  next unless file.size > 0
+                  a = Attachment.create(:container => @document, :file => file, :author => logged_in_user)
+                  @attachments << a unless a.new_record?
                 } if params[:attachments] and params[:attachments].is_a? Array
+                Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                 redirect_to :action => 'show', :id => @document
               end

app/controllers/issues_controller.rb +7 -4

             # redMine - project management software
-            # Copyright (C) 2006  Jean-Philippe Lang
+            # Copyright (C) 2006-2007  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
               def add_attachment
                 # Save the attachments
-                params[:attachments].each { |a|
+                @attachments = []
-                  @attachment = @issue.attachments.build(:file => a, :author => self.logged_in_user) unless a.size == 0
+                params[:attachments].each { |file|
-                  @attachment.save
+                  next unless file.size > 0
+                  a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)
+                  @attachments << a unless a.new_record?
                 } if params[:attachments] and params[:attachments].is_a? Array
+                Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                 redirect_to :action => 'show', :id => @issue
               end

app/controllers/projects_controller.rb +7 -2

                     Attachment.create(:container => @document, :file => a, :author => logged_in_user) unless a.size == 0
                   } if params[:attachments] and params[:attachments].is_a? Array
                   flash[:notice] = l(:notice_successful_create)
+                  Mailer.deliver_document_add(@document) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                   redirect_to :action => 'list_documents', :id => @project
                 end
               end
                 if request.post?
                   @version = @project.versions.find_by_id(params[:version_id])
                   # Save the attachments
-                  params[:attachments].each { |a|
+                  @attachments = []
-                    Attachment.create(:container => @version, :file => a, :author => logged_in_user) unless a.size == 0
+                  params[:attachments].each { |file|
+                    next unless file.size > 0
+                    a = Attachment.create(:container => @version, :file => file, :author => logged_in_user)
+                    @attachments << a unless a.new_record?
                   } if params[:attachments] and params[:attachments].is_a? Array
+                  Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                 end
                 @versions = @project.versions

app/models/mailer.rb +30 0

@@ -36,6 +36,36 class Mailer < ActionMailer::Base
36	@body['journal']= journal	36	@body['journal']= journal
37	end	37	end
38		38
		39	def document_add(document)
		40	@recipients = document.project.users.collect { \|u\| u.mail if u.mail_notification }.compact
		41	@from = Setting.mail_from
		42	@subject = "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
		43	@body['document'] = document
		44	end
		45
		46	def attachments_add(attachments)
		47	container = attachments.first.container
		48	url = "http://#{Setting.host_name}/"
		49	added_to = ""
		50	case container.class.to_s
		51	when 'Version'
		52	url << "projects/list_files/#{container.project_id}"
		53	added_to = "#{l(:label_version)}: #{container.name}"
		54	when 'Document'
		55	url << "documents/show/#{container.id}"
		56	added_to = "#{l(:label_document)}: #{container.title}"
		57	when 'Issue'
		58	url << "issues/show/#{container.id}"
		59	added_to = "#{container.tracker.name} ##{container.id}: #{container.subject}"
		60	end
		61	@recipients = container.project.users.collect { \|u\| u.mail if u.mail_notification }.compact
		62	@from = Setting.mail_from
		63	@subject = "[#{container.project.name}] #{l(:label_attachment_new)}"
		64	@body['attachments'] = attachments
		65	@body['url'] = url
		66	@body['added_to'] = added_to
		67	end
		68
39	def lost_password(token)	69	def lost_password(token)
40	@recipients = token.user.mail	70	@recipients = token.user.mail
41	@from = Setting.mail_from	71	@from = Setting.mail_from

	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