jro_apps/redmine Commit - r4108:26ef9da02b7e

Changed the notifications to use a hierarchy UI...

Eric Davis -

r4108:26ef9da02b7e

parent child

Context file:

r4108:26ef9da02b7e

app/helpers/settings_helper.rb +10 0

@@ -71,4 +71,14 module SettingsHelper
71	label = options.delete(:label)	71	label = options.delete(:label)
72	label != false ? content_tag("label", l(label \|\| "setting_#{setting}")) : ''	72	label != false ? content_tag("label", l(label \|\| "setting_#{setting}")) : ''
73	end	73	end
		74
		75	# Renders a notification field for a Redmine::Notifiable option
		76	def notification_field(notifiable)
		77	return content_tag(:label,
		78	check_box_tag('settings[notified_events][]',
		79	notifiable.name,
		80	Setting.notified_events.include?(notifiable.name)) +
		81	l_or_humanize(notifiable.name, :prefix => 'label_'),
		82	:class => notifiable.parent.present? ? "parent" : '')
		83	end
74	end	84	end

app/views/settings/_notifications.rhtml +7 -5

             </div>
-            <fieldset class="box settings" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend>
+            <fieldset class="box" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend>
-            	<%= setting_multiselect(:notified_events,
+            <%= hidden_field_tag 'settings[notified_events][]', '' %>
-                    @notifiables.collect {|notifiable| [l_or_humanize(notifiable, :prefix => 'label_'), notifiable]}, :label => false) %>
+            <% @notifiables.each do |notifiable| %>
+            <%= notification_field notifiable %>
-            	<p><%= check_all_links('notified_events') %></p>
+            <br />
+            <% end %>
+            <p><%= check_all_links('notified_events') %></p>
             </fieldset>
             <fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend>

lib/redmine/notifiable.rb +18 -15

@@ -1,22 +1,25
1	module Redmine	1	module Redmine
2	class Notifiable	2	class Notifiable < Struct.new(:name, :parent)
3	CoreNotifications = [
4	'issue_added',
5	'issue_updated',
6	'issue_note_added',
7	'issue_status_updated',
8	'issue_priority_updated',
9	'news_added',
10	'document_added',
11	'file_added',
12	'message_posted',
13	'wiki_content_added',
14	'wiki_content_updated'
15	]
16		3
		4	def to_s
		5	name
		6	end
		7
17	# TODO: Plugin API for adding a new notification?	8	# TODO: Plugin API for adding a new notification?
18	def self.all	9	def self.all
19	~~CoreN~~otifications	10	notifications = []
		11	notifications << Notifiable.new('issue_added')
		12	notifications << Notifiable.new('issue_updated')
		13	notifications << Notifiable.new('issue_note_added', 'issue_updated')
		14	notifications << Notifiable.new('issue_status_updated', 'issue_updated')
		15	notifications << Notifiable.new('issue_priority_updated', 'issue_updated')
		16	notifications << Notifiable.new('news_added')
		17	notifications << Notifiable.new('document_added')
		18	notifications << Notifiable.new('file_added')
		19	notifications << Notifiable.new('message_posted')
		20	notifications << Notifiable.new('wiki_content_added')
		21	notifications << Notifiable.new('wiki_content_updated')
		22	notifications
20	end	23	end
21	end	24	end
22	end	25	end

public/javascripts/application.js +7 -1

             	for (i = 0; i < boxes.length; i++) { boxes[i].checked = !all_checked; }
             }
+            function setCheckboxesBySelector(checked, selector) {
+              var boxes = $$(selector);
+              boxes.each(function(ele) {
+                ele.checked = checked;
+              });
+            }
             function showAndScrollTo(id, focus) {
             	Element.show(id);
             	if (focus!=null) { Form.Element.focus(focus); }
                 dLabel.addClassName('inline');
                 // Pulls the languge value used for Optional Description
                 dLabel.update($('attachment_description_label_content').innerHTML)
                 p = document.getElementById("attachments_fields");
                 p.appendChild(document.createElement("br"));
                 p.appendChild(f);

public/stylesheets/application.css +1 0

             .tabular.settings textarea { width: 99%; }
             fieldset.settings label { display: block; }
+            .parent { padding-left: 20px; }
             .required {color: #bb0000;}
             .summary {font-style: italic;}

test/unit/lib/redmine/notifiable_test.rb +3 -10

               def setup
               end
-              def test_included_core_notifications
+              def test_all
-                assert_equal 11, Redmine::Notifiable::CoreNotifications.length
+                assert_equal 11, Redmine::Notifiable.all.length
-                Redmine::Notifiable::CoreNotifications.length
                 %w(issue_added issue_updated issue_note_added issue_status_updated issue_priority_updated news_added document_added file_added message_posted wiki_content_added wiki_content_updated).each do |notifiable|
-                  assert Redmine::Notifiable::CoreNotifications.include?(notifiable), "missing #{notifiable}"
+                  assert Redmine::Notifiable.all.collect(&:name).include?(notifiable), "missing #{notifiable}"
-                end
-              end
-              def test_all_should_include_all_of_the_core_notifications
-                Redmine::Notifiable::CoreNotifications.each do |notifiable|
-                  assert Redmine::Notifiable.all.include?(notifiable), "missing #{notifiable} in #all"
                 end
               end
             end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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