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: clean up backlinks, tests
Date Mon, 23 Apr 2018 15:00:26 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 2895a4c  clean up backlinks, tests
2895a4c is described below

commit 2895a4c53548a34b0a77ce2164cdf250c2347106
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Mon Apr 23 11:00:07 2018 -0400

    clean up backlinks, tests
---
 www/board/agenda/spec/other_views_spec.rb  | 6 +++---
 www/board/agenda/views/layout/footer.js.rb | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/www/board/agenda/spec/other_views_spec.rb b/www/board/agenda/spec/other_views_spec.rb
index 00a0196..3f7736f 100644
--- a/www/board/agenda/spec/other_views_spec.rb
+++ b/www/board/agenda/spec/other_views_spec.rb
@@ -109,13 +109,13 @@ feature 'other reports' do
   end
 
   it "should skip to missing/flagged items once meeting has started" do
-    visit '/2015-02-18/Security-Team'
+    visit '/2015-02-18/Vice-Chairman'
     expect(page).to have_selector '.nextlink[href="flagged/Abdera"]',
       text: 'Abdera'
 
     visit '/2015-02-18/flagged/Abdera'
-    expect(page).to have_selector '.backlink[href="Security-Team"]',
-      text: 'Security Team'
+    expect(page).to have_selector '.backlink[href="Vice-Chairman"]',
+      text: 'Vice Chairman'
 
     visit '/2015-02-18/flagged/Xerces'
     expect(page).to have_selector '.nextlink[href="Change-Geronimo-Chair"]',
diff --git a/www/board/agenda/views/layout/footer.js.rb b/www/board/agenda/views/layout/footer.js.rb
index 8cd2c6d..5f713fd 100644
--- a/www/board/agenda/views/layout/footer.js.rb
+++ b/www/board/agenda/views/layout/footer.js.rb
@@ -38,18 +38,20 @@ class Footer < Vue
 
         unless link
           if Minutes.started
-            link = Agenda.index.find {|item| item.attach == 'A'}.prev
+            link = Agenda.index.find do |item| 
+              item.next && item.next.attach =~ /^\d+$/
+            end
             prefix = ''
           end
 
-          link ||= {href: "../flagged", title: 'Flagged'}
+          link ||= {href: "flagged", title: 'Flagged'}
         end
       elsif 
         Minutes.started and @@item.attach =~ /\d/ and
         link and link.attach =~ /^[A-Z]/
       then
         Agenda.index.each do |item| 
-          if item.flagged and item.attach =~ /^[A-Z]/
+          if not item.skippable and item.attach =~ /^([A-Z]|\d+$)/
             prefix = 'flagged/'
             link = item 
           end

-- 
To stop receiving notification emails like this one, please contact
rubys@apache.org.

Mime
View raw message