You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2018/05/27 16:19:07 UTC
[whimsy] branch master updated: show shepherd for officers that
report to the president even after meeting has started
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new dad5dac show shepherd for officers that report to the president even after meeting has started
dad5dac is described below
commit dad5dacfb25d935624a9619aa62fe84a331ba875
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sun May 27 12:18:34 2018 -0400
show shepherd for officers that report to the president even after meeting has started
---
www/board/agenda/views/models/agenda.js.rb | 40 +++++++++++++++---------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/www/board/agenda/views/models/agenda.js.rb b/www/board/agenda/views/models/agenda.js.rb
index 98e18f8..d048e85 100644
--- a/www/board/agenda/views/models/agenda.js.rb
+++ b/www/board/agenda/views/models/agenda.js.rb
@@ -29,27 +29,27 @@ class Agenda
end
# remove president attachments from the normal flow
- unless Minutes.started
- @@index.each do |pres|
- match = (pres.title == 'President' and pres.text and pres.text.
- match(/Additionally, please see Attachments (\d) through (\d)/))
- next unless match
-
- first = last = nil
- @@index.each do |item|
- first = item if item.attach == match[1]
- item._shepherd ||= pres.shepherd if first and !last
- last = item if item.attach == match[2]
- end
+ @@index.each do |pres|
+ match = (pres.title == 'President' and pres.text and pres.text.
+ match(/Additionally, please see Attachments (\d) through (\d)/))
+ next unless match
+
+ # find first and last president report; update shepherd along the way
+ first = last = nil
+ @@index.each do |item|
+ first = item if item.attach == match[1]
+ item._shepherd ||= pres.shepherd if first and !last
+ last = item if item.attach == match[2]
+ end
- if first and last
- first.prev.next = last.next
- last.next.prev = first.prev
- last.next.index = first.index
- first.index = nil
- last.next = pres
- first.prev = pres
- end
+ # remove president attachments from the normal flow
+ if first and last and not Minutes.started
+ first.prev.next = last.next
+ last.next.prev = first.prev
+ last.next.index = first.index
+ first.index = nil
+ last.next = pres
+ first.prev = pres
end
end
--
To stop receiving notification emails like this one, please contact
rubys@apache.org.