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: don't confuse non-project Establish resolutions with project resolutions
Date Fri, 14 Jun 2019 14:31:18 GMT
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 eddaef5  don't confuse non-project Establish resolutions with project resolutions
eddaef5 is described below

commit eddaef56425984e9e84a8e7749e2e16fb612a333
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Fri Jun 14 10:30:53 2019 -0400

    don't confuse non-project Establish resolutions with project resolutions
---
 lib/whimsy/asf/agenda/special.rb           | 4 ++--
 www/board/agenda/views/layout/header.js.rb | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/whimsy/asf/agenda/special.rb b/lib/whimsy/asf/agenda/special.rb
index ecd2645..068f0c8 100644
--- a/lib/whimsy/asf/agenda/special.rb
+++ b/lib/whimsy/asf/agenda/special.rb
@@ -54,7 +54,7 @@ class ASF::Board::Agenda
 
       title_checks.each do |select, match|
         if fulltitle =~ select and fulltitle !~ match and
-          fulltitle !~ /Establish.*position/i
+          fulltitle =~ /chair|project|committee/i
        then
           attrs['warnings'] << 
             "Non-standard title wording: #{fulltitle.inspect}; " +
@@ -123,7 +123,7 @@ class ASF::Board::Agenda
           attrs['warnings'] ||= ['non apache.org email address found'] 
         end
 
-        need_chair = true unless fulltitle =~ /Establish.*position/i
+        need_chair = true if fulltitle =~ /chair|project|committee/i
       end
 
       if need_chair
diff --git a/www/board/agenda/views/layout/header.js.rb b/www/board/agenda/views/layout/header.js.rb
index d05cad2..2448e76 100644
--- a/www/board/agenda/views/layout/header.js.rb
+++ b/www/board/agenda/views/layout/header.js.rb
@@ -16,10 +16,8 @@ class Header < Vue
     _header.navbar.navbar_fixed_top class: @@item.color do
       _div.navbar_brand @@item.title
 
-      if @@item.attach =~ /^7/ and @@item.title =~ /^Establish /
-        if @@item.title !~ /^Establish .*(Position|Committee)/i
-          _PodlingNameSearch item: @@item
-        end
+      if @@item.attach =~ /^7/ and @@item.title =~ /^Establish .* Project/
+        _PodlingNameSearch item: @@item
       end
 
       _span.clock! "\u231B" if Header.clock_counter > 0


Mime
View raw message