Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add checklist info to email subject and fixbug #25

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions app/views/mailer/issue_add.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<%= l(:text_issue_added, :id => link_to("##{@issue.id}", @issue_url), :author => h(@issue.author)).html_safe %>
<hr />
<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>

<div id="issue_checklist">
<p><strong><%= l(:label_issue_checklist_plural) %></strong></p>
<ul id="issue_checklist_items">
<% @issue.checklist.each do |checklist_item| %>
<li>
<%= check_box_tag 'checklist_item', '1', checklist_item.is_done %>
<%= textilizable(checklist_item, :subject).gsub(/<\/?(p|h\d+|li|ul)>/, '').strip.html_safe %>
</li>
<% end %>
</ul>
</div>
27 changes: 27 additions & 0 deletions app/views/mailer/issue_edit.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<% if @journal.private_notes? %>
(<%= l(:field_private_notes) %>)
<% end %>
<%= l(:text_issue_updated, :id => link_to("##{@issue.id}", @issue_url), :author => h(@journal.user)).html_safe %>

<ul>
<% details_to_strings(@journal_details, false, :only_path => false).each do |string| %>
<li><%= string %></li>
<% end %>
</ul>

<%= textilizable(@journal, :notes, :only_path => false) %>
<hr />
<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>

<div id="issue_checklist">
<p><strong><%= l(:label_issue_checklist_plural) %></strong></p>
<ul id="issue_checklist_items">
<% @issue.checklist.each do |checklist_item| %>
<li>
<%= check_box_tag 'checklist_item', '1', checklist_item.is_done %>
<%= textilizable(checklist_item, :subject).gsub(/<\/?(p|h\d+|li|ul)>/, '').strip.html_safe %>
</li>
<% end %>
</ul>
</div>

1 change: 1 addition & 0 deletions lib/redmine_issue_checklist/hooks/model_issue_hook.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def controller_issues_new_after_save(context={})
def save_checklist_to_issue(context, create_journal)
issue = context[:issue]
checklist_items = context[:params] && context[:params][:check_list_items]
checklist_items ||= []
issue.update_checklist_items(checklist_items, create_journal) if issue && checklist_items
end

Expand Down
36 changes: 36 additions & 0 deletions lib/redmine_issue_checklist/patches/mailer_patch.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
require_dependency 'mailer'

module RedmineIssueChecklist
module Patches

module MailerPatch

def self.included(base) # :nodoc:
base.send(:include, InstanceMethods)
base.class_eval do
alias_method_chain :issue_add, :checklist
alias_method_chain :issue_edit, :checklist
end

end

module InstanceMethods

def issue_add_with_checklist(issue, to_users, cc_users)
issue_add_without_checklist(issue, to_users, cc_users)
end

def issue_edit_with_checklist(issue, to_users, cc_users)
issue_edit_without_checklist(issue, to_users, cc_users)
end
end

end

end
end


unless Mailer.included_modules.include?(RedmineIssueChecklist::Patches::MailerPatch)
Mailer.send(:include, RedmineIssueChecklist::Patches::MailerPatch)
end
1 change: 1 addition & 0 deletions lib/redmine_issue_checklist/redmine_issue_checklist.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
Rails.configuration.to_prepare do
require 'redmine_issue_checklist/patches/issue_patch'
require 'redmine_issue_checklist/patches/issues_controller_patch'
require 'redmine_issue_checklist/patches/mailer_patch'
end

module RedmineIssueChecklist
Expand Down