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 2019/11/21 18:08:15 UTC
[whimsy] branch master updated (71af3dd -> b17a351)
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git.
from 71af3dd fix precedence problem
new eb90b9d Revert "fix precedence problem"
new b17a351 fix precedence problems
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
www/board/agenda/views/models/agenda.js.rb | 3 +--
www/board/agenda/views/pages/report.js.rb | 9 +--------
2 files changed, 2 insertions(+), 10 deletions(-)
[whimsy] 02/02: fix precedence problems
Posted by ru...@apache.org.
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 b17a351b2843b7d011c098003a56e18b03fb0eee
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Thu Nov 21 13:07:48 2019 -0500
fix precedence problems
(this time, only committing files related to this fix)
---
www/board/agenda/views/layout/footer.js.rb | 2 +-
www/board/agenda/views/pages/flagged.js.rb | 2 +-
2 files changed, 2 insertions(+), 2 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/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
[whimsy] 01/02: Revert "fix precedence problem"
Posted by ru...@apache.org.
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 eb90b9d8773fb24c6e034890f379249f2f727c1f
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Thu Nov 21 13:06:56 2019 -0500
Revert "fix precedence problem"
This reverts commit 71af3ddd0af5e5981c8c288fa4e1bb3fb4885da9.
---
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, 4 insertions(+), 12 deletions(-)
diff --git a/www/board/agenda/views/layout/footer.js.rb b/www/board/agenda/views/layout/footer.js.rb
index 1b0f892..b6d9f47 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 ||
+ meeting_day = Minutes.started or
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 2d3fb62..3468ae2 100644
--- a/www/board/agenda/views/models/agenda.js.rb
+++ b/www/board/agenda/views/models/agenda.js.rb
@@ -558,7 +558,6 @@ 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
@@ -569,7 +568,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 self.missing
+ return (@to == 'president') if Minutes.started and 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 6a48d0b..aa1f403 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 ||
+ meeting_day = Minutes.started or
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 fb899a6..f5b2a75 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, self.zoom] if @@item.title == 'Call to order'
+ list = [self.localtime, hotlink] 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,13 +173,6 @@ 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/'