Merge remote-tracking branch 'lanzelotik/master' into cari

See also: sciyoshi#103
cat-in-136 · Aug 19, 2018 · 39a71bc · 39a71bc
2 parents 781556d + 74e8efa
commit 39a71bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/app/views/settings/_slack_settings.html.erb b/app/views/settings/_slack_settings.html.erb
@@ -49,3 +49,10 @@
 	<label for="settings_post_wiki_updates">Post Wiki Updates?</label>
 	<input type="checkbox" id="settings_post_wiki_updates" value="1" name="settings[post_wiki_updates]" <%= settings['post_wiki_updates'] == '1' ? 'checked="checked"' : '' %> />
 </p>
+<p>
+        <label for="settings_exclude_fields">Exclude Fields</label>
+	<textarea id="settings_exclude_fields" name="settings[exclude_fields]"><%= settings['exclude_fields'] %></textarea>
+</p>
+<p>
+	Comma-separated values. Field names or custom field id. For example: due_date,1,2
+</p>
diff --git a/lib/redmine_slack/listener.rb b/lib/redmine_slack/listener.rb
@@ -45,6 +45,7 @@ def redmine_slack_issues_new_after_save(context={})
 	def redmine_slack_issues_edit_after_save(context={})
 		issue = context[:issue]
 		journal = context[:journal]
+		journal.details.delete_if { |x| Setting.plugin_redmine_slack[:exclude_fields].split(",").include? x.prop_key.to_s }
 
 		channel = channel_for_project issue.project
 		url = url_for_project issue.project