Commit 5d212104da5d74099a321c806fd147cda2304870:
Merge branch 'master' of github.com:apache/whimsy
Branch: refs/heads/master
Author: Sam Ruby <[email protected]>
Committer: Sam Ruby <[email protected]>
Pusher: rubys <[email protected]>
------------------------------------------------------------
www/roster/public_nonldap_groups.rb | + -
www/roster/views/committee.js.rb | + -
www/roster/views/pmc/confirm.js.rb | + -
www/status/monitors/secmail.rb | +++++
www/status/monitors/svn.rb | +++++++ -
------------------------------------------------------------
19 changes: 15 additions, 4 deletions.
------------------------------------------------------------
diff --git a/www/roster/public_nonldap_groups.rb
b/www/roster/public_nonldap_groups.rb
index b0f77e4..2deb6db 100644
--- a/www/roster/public_nonldap_groups.rb
+++ b/www/roster/public_nonldap_groups.rb
@@ -52,7 +52,7 @@
public_json_output(
# There does not seem to be a useful timestamp here
- groups: groups,
+ groups: groups
# TODO decide how to present the data: separate key or attribute or file
#pitgroups: pitgroups
)
diff --git a/www/roster/views/committee.js.rb b/www/roster/views/committee.js.rb
index f28da2a..4f6ee52 100644
--- a/www/roster/views/committee.js.rb
+++ b/www/roster/views/committee.js.rb
@@ -383,7 +383,7 @@ def render
end
_div.modal_footer do
- _button.btn.btn_default 'Cancel', data_dismiss:"modal"
+ _button.btn.btn_default 'Cancel', data_dismiss: 'modal'
_button.btn @button, class: @color, onClick: self.post
end
end
diff --git a/www/roster/views/pmc/confirm.js.rb
b/www/roster/views/pmc/confirm.js.rb
index 11a496e..cc78da3 100644
--- a/www/roster/views/pmc/confirm.js.rb
+++ b/www/roster/views/pmc/confirm.js.rb
@@ -23,7 +23,7 @@ def render
end
_div.modal_footer do
- _button.btn.btn_default 'Cancel', data_dismiss:"modal"
+ _button.btn.btn_default 'Cancel', data_dismiss: 'modal'
_button.btn @button, class: @color, onClick: self.post
end
end
diff --git a/www/status/monitors/secmail.rb b/www/status/monitors/secmail.rb
index e465e5e..566db40 100644
--- a/www/status/monitors/secmail.rb
+++ b/www/status/monitors/secmail.rb
@@ -7,3 +7,8 @@ def Monitor.secmail(previous_status)
{mtime: File.mtime(log)}
end
+
+# for debugging purposes
+if __FILE__ == $0
+ puts Monitor.secmail(nil)
+end
diff --git a/www/status/monitors/svn.rb b/www/status/monitors/svn.rb
index 8a482c3..570fc05 100644
--- a/www/status/monitors/svn.rb
+++ b/www/status/monitors/svn.rb
@@ -35,7 +35,8 @@ def Monitor.svn(previous_status)
if not data
title = "partial response"
level = 'warning'
- elsif data.length == 1
+ # data may be a String rather than an array in which case .length is its
length, not 1
+ elsif String === data or data.length == 1
title = "1 file updated"
else
title = "#{data.length} files updated"
@@ -53,3 +54,8 @@ def Monitor.svn(previous_status)
{data: status}
end
+
+# for debugging purposes
+if __FILE__ == $0
+ puts Monitor.svn(nil)
+end
