whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] 02/02: fix precedence problem
Date Thu, 21 Nov 2019 18:06:04 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

commit 71af3ddd0af5e5981c8c288fa4e1bb3fb4885da9
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Thu Nov 21 13:05:47 2019 -0500

    fix precedence problem
---
 www/board/agenda/views/layout/footer.js.rb | 2 +-
 www/board/agenda/views/models/agenda.js.rb | 3 ++-
 www/board/agenda/views/pages/flagged.js.rb | 2 +-
 www/board/agenda/views/pages/report.js.rb  | 9 ++++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/www/board/agenda/views/layout/footer.js.rb b/www/board/agenda/views/layout/footer.js.rb
index b6d9f47..1b0f892 100644
--- a/www/board/agenda/views/layout/footer.js.rb
+++ b/www/board/agenda/views/layout/footer.js.rb
@@ -11,7 +11,7 @@
 class Footer < Vue
   def render
     
-    meeting_day = Minutes.started or
+    meeting_day = Minutes.started ||
       Date.new().toISOString().slice(0,10) >= Agenda.date
 
     _footer.navbar.navbar_fixed_bottom class: @@item.color do
diff --git a/www/board/agenda/views/models/agenda.js.rb b/www/board/agenda/views/models/agenda.js.rb
index 3468ae2..2d3fb62 100644
--- a/www/board/agenda/views/models/agenda.js.rb
+++ b/www/board/agenda/views/models/agenda.js.rb
@@ -558,6 +558,7 @@ class Agenda
   # determine if this item is flagged, accounting for pending actions
   def flagged
     return true if Pending.flagged and Pending.flagged.include? @attach
+    return (@to == 'president') if self.missing
     return false unless @flagged_by
     return false if @flagged_by.length == 1 and 
       @flagged_by.first == User.initials and 
@@ -568,7 +569,7 @@ class Agenda
   # determine if this report can be skipped during the course of the meeting
   def skippable
     return false if self.flagged
-    return (@to == 'president') if Minutes.started and self.missing
+    return (@to == 'president') if self.missing
     return false if Minutes.started and @approved and @approved.length < 5
     return true
   end
diff --git a/www/board/agenda/views/pages/flagged.js.rb b/www/board/agenda/views/pages/flagged.js.rb
index aa1f403..6a48d0b 100644
--- a/www/board/agenda/views/pages/flagged.js.rb
+++ b/www/board/agenda/views/pages/flagged.js.rb
@@ -7,7 +7,7 @@
 class Flagged < Vue
   def render
     first = true
-    meeting_day = Minutes.started or
+    meeting_day = Minutes.started ||
       Date.new().toISOString().slice(0,10) >= Agenda.date
 
     if meeting_day
diff --git a/www/board/agenda/views/pages/report.js.rb b/www/board/agenda/views/pages/report.js.rb
index f5b2a75..fb899a6 100644
--- a/www/board/agenda/views/pages/report.js.rb
+++ b/www/board/agenda/views/pages/report.js.rb
@@ -96,7 +96,7 @@ class Report < Vue
   # determine what text filters to run
   def filters
     list = [self.linebreak, self.todo, hotlink, self.privates, self.jira]
-    list = [self.localtime, hotlink] if @@item.title == 'Call to order'
+    list = [self.localtime, hotlink, self.zoom] if @@item.title == 'Call to order'
     list << self.names if @@item.people
     list << self.president_attachments if @@item.title == 'President'
     list << self.linkMinutes if @@item.attach =~ /^[37][A-Z]$/
@@ -173,6 +173,13 @@ class Report < Vue
     end
   end
 
+  # make zoom links highlighted and open in a new window
+  def zoom(text)
+    return text.sub /https:\/\/zoom.*?['"]>/ do |match|
+      match + ' class="commented" target="_blank"'
+    end
+  end
+
   # replace ids with committer links
   def names(text)
     roster = '/roster/committer/'


Mime
View raw message