jro_apps/redmine Commit - r823:dead6a28f81c

0

app/views/mailer/attachments_added.text.html.rhtml created 644 +5 0

@@ -0,0 +1,5
	1	<%= link_to @added_to, @url %><br />
	2
	3	<ul><% @attachments.each do \|attachment \| %>
	4	<li><%= attachment.filename %></li>
	5	<% end %></ul>

0

app/views/mailer/attachments_added.text.plain.rhtml created 644 +4 0

@@ -0,0 +1,4
	1	<%= @added_to %><% @attachments.each do \|attachment \| %>
	2	- <%= attachment.filename %><% end %>
	3
	4	<%= url_for @url %>

0

app/views/mailer/document_added.text.html.rhtml created 644 +4 0

@@ -0,0 +1,4
	1	<%= link_to @document.title, :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %>
	2	(<%= @document.category.name %>)<br />
	3	<br />
	4	<%= textilizable(@document.description) %>

0

app/views/mailer/document_added.text.plain.rhtml created 644 +4 0

@@ -0,0 +1,4
	1	<%= @document.title %> (<%= @document.category.name %>)
	2	<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %>
	3
	4	<%= @document.description %>

0

app/controllers/documents_controller.rb +1 -1

                   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? && Setting.notified_events.include?('document_added')
+                Mailer.deliver_attachments_added(@attachments) if !@attachments.empty? && Setting.notified_events.include?('document_added')
                 redirect_to :action => 'show', :id => @document
               end

0

app/controllers/projects_controller.rb +2 -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 Setting.notified_events.include?('document_added')
+                  Mailer.deliver_document_added(@document) if Setting.notified_events.include?('document_added')
                   redirect_to :action => 'list_documents', :id => @project
                 end
               end
                     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? && Setting.notified_events.include?('file_added')
+                  Mailer.deliver_attachments_added(@attachments) if !@attachments.empty? && Setting.notified_events.include?('file_added')
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                 end
                 @versions = @project.versions.sort

0

app/models/mailer.rb +4 -7

                 @body['journal']= journal
               end
-              def document_add(document)
+              def document_added(document)
                 set_language_if_valid(Setting.default_language)
                 @recipients     = document.project.users.collect { |u| u.mail if u.mail_notification }.compact
                 @from           = Setting.mail_from
                 @body['document'] = document
               end
-              def attachments_add(attachments)
+              def attachments_added(attachments)
                 set_language_if_valid(Setting.default_language)
                 container = attachments.first.container
                 url = ''
                 added_to = ''
                 case container.class.name
                 when 'Version'
-                  url = url_for(:only_path => false, :host => Setting.host_name, :controller => 'projects', :action => 'list_files', :id => container.project_id)
+                  url = {:only_path => false, :host => Setting.host_name, :controller => 'projects', :action => 'list_files', :id => container.project_id}
                   added_to = "#{l(:label_version)}: #{container.name}"
                 when 'Document'
-                  url = url_for(:only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => container.id)
+                  url = {:only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => container.id}
                   added_to = "#{l(:label_document)}: #{container.title}"
-                when 'Issue'
-                  url = url = url_for(:only_path => false, :host => Setting.host_name, :controller => 'issues', :action => 'show', :id => container.id)
-                  added_to = "#{container.tracker.name} ##{container.id}: #{container.subject}"
                 end
                 @recipients     = container.project.users.collect { |u| u.mail if u.mail_notification }.compact
                 @from           = Setting.mail_from

0

test/unit/mailer_test.rb +1 -1

                 document = Document.find(1)
                 GLoc.valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
-                  assert Mailer.deliver_document_add(document)
+                  assert Mailer.deliver_document_added(document)
                 end
               end

0

app/views/mailer/attachments_add.rhtml removed 0 -6

1

NO CONTENT: file was removed

0

app/views/mailer/attachments_add_bg.rhtml removed 0 -6

1

NO CONTENT: file was removed

0

app/views/mailer/attachments_add_de.rhtml removed 0 -6

1

NO CONTENT: file was removed

0

app/views/mailer/attachments_add_fr.rhtml removed 0 -6

1

NO CONTENT: file was removed

0

app/views/mailer/attachments_add_it.rhtml removed 0 -6

1

NO CONTENT: file was removed

0

app/views/mailer/attachments_add_ja.rhtml removed 0 -6

1

NO CONTENT: file was removed

0

app/views/mailer/attachments_add_nl.rhtml removed 0 -6

1

NO CONTENT: file was removed

0

app/views/mailer/attachments_add_pl.rhtml removed 0 -6

1

NO CONTENT: file was removed

0

app/views/mailer/attachments_add_pt-br.rhtml removed 0 -6

1

NO CONTENT: file was removed

0

app/views/mailer/attachments_add_pt.rhtml removed 0 -6

1

NO CONTENT: file was removed

0

app/views/mailer/attachments_add_sv.rhtml removed 0 -6

1

NO CONTENT: file was removed

0

app/views/mailer/attachments_add_zh.rhtml removed 0 -6

1

NO CONTENT: file was removed

0

app/views/mailer/document_add.rhtml removed 0 -4

1

NO CONTENT: file was removed

0

app/views/mailer/document_add_bg.rhtml removed 0 -4

1

NO CONTENT: file was removed

0

app/views/mailer/document_add_de.rhtml removed 0 -4

1

NO CONTENT: file was removed

0

app/views/mailer/document_add_fr.rhtml removed 0 -4

1

NO CONTENT: file was removed

0

app/views/mailer/document_add_it.rhtml removed 0 -4

1

NO CONTENT: file was removed

0

app/views/mailer/document_add_ja.rhtml removed 0 -4

1

NO CONTENT: file was removed

0

app/views/mailer/document_add_nl.rhtml removed 0 -4

1

NO CONTENT: file was removed

0

app/views/mailer/document_add_pl.rhtml removed 0 -4

1

NO CONTENT: file was removed

0

app/views/mailer/document_add_pt-br.rhtml removed 0 -4

1

NO CONTENT: file was removed

0

app/views/mailer/document_add_pt.rhtml removed 0 -4

1

NO CONTENT: file was removed

0

app/views/mailer/document_add_sv.rhtml removed 0 -4

1

NO CONTENT: file was removed

0

app/views/mailer/document_add_zh.rhtml removed 0 -4

1

NO CONTENT: file was removed

	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