whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: cross-link reports to related special orders
Date Tue, 19 Apr 2016 21:58:00 GMT
This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git

The following commit(s) were added to refs/heads/master by this push:
       new  fb02f06   cross-link reports to related special orders
fb02f06 is described below

commit fb02f0638eb790ecebc990d92f25585859a80066
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Tue Apr 19 17:57:40 2016 -0400

    cross-link reports to related special orders
---
 www/board/agenda/views/elements/additional-info.js.rb | 11 +++++++++++
 www/board/agenda/views/models/agenda.js.rb            | 12 ++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/www/board/agenda/views/elements/additional-info.js.rb b/www/board/agenda/views/elements/additional-info.js.rb
index b78bfde..adeeaa4 100644
--- a/www/board/agenda/views/elements/additional-info.js.rb
+++ b/www/board/agenda/views/elements/additional-info.js.rb
@@ -75,6 +75,17 @@ class AdditionalInfo < React
       _ActionItems item: @@item, filter: {pmc: @@item.title}
     end
 
+    unless @@item.special_orders.empty?
+      _h4 'Special Orders', id: "#{@prefix}orders"
+      _ul do
+        @@item.special_orders.each do |resolution|
+          _li do
+            _Link text: resolution.title, href: resolution.link
+          end
+        end
+      end
+    end
+
     # minutes
     minutes = Minutes.get(@@item.title)
     if minutes
diff --git a/www/board/agenda/views/models/agenda.js.rb b/www/board/agenda/views/models/agenda.js.rb
index a25d3bf..e35c45e 100644
--- a/www/board/agenda/views/models/agenda.js.rb
+++ b/www/board/agenda/views/models/agenda.js.rb
@@ -166,6 +166,18 @@ class Agenda
     end
   end
 
+  def special_orders
+    items = []
+
+    if @attach =~ /^[A-Z]+$/
+      Agenda.index.each do |item|
+        items << item if item.attach =~ /^7/ and item.roster == @roster
+      end
+    end
+
+    return items
+  end
+
   def ready_for_review(initials)
     return defined?(@approved) && !self.missing &&
       !@approved.include?(initials) &&

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message