This is an automated email from the ASF dual-hosted git repository.
sebb 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 4037790f Update more Attachment number matches
4037790f is described below
commit 4037790ff7deccf0a8ecc72ad93e0fcfec4162e1
Author: Sebb <[email protected]>
AuthorDate: Sun Jul 14 12:03:08 2024 +0100
Update more Attachment number matches
---
www/board/agenda/views/buttons/post.js.rb | 2 +-
www/board/agenda/views/models/agenda.js.rb | 2 +-
www/board/agenda/views/pages/report.js.rb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/www/board/agenda/views/buttons/post.js.rb
b/www/board/agenda/views/buttons/post.js.rb
index c563e543..ddffb623 100644
--- a/www/board/agenda/views/buttons/post.js.rb
+++ b/www/board/agenda/views/buttons/post.js.rb
@@ -419,7 +419,7 @@ class Post < Vue
if not @edited
text = @report || @@item.text || ''
if @@item.title == 'President'
- text.sub! /\s*Additionally, please see Attachments \d through \d\./, ''
+ text.sub! /\s*Additionally, please see Attachments \d through
\d\d?\./, ''
end
@report = text
diff --git a/www/board/agenda/views/models/agenda.js.rb
b/www/board/agenda/views/models/agenda.js.rb
index b1ca2502..4c9334e5 100644
--- a/www/board/agenda/views/models/agenda.js.rb
+++ b/www/board/agenda/views/models/agenda.js.rb
@@ -32,7 +32,7 @@ class Agenda
# remove president attachments from the normal flow
@@index.each do |pres|
match = (pres.title == 'President' and pres.text and pres.text.
- match(/Additionally, please see Attachments (\d) through (\d)/))
+ match(/Additionally, please see Attachments (\d) through (\d\d?)\./))
next unless match
# find first and last president report; update shepherd along the way
diff --git a/www/board/agenda/views/pages/report.js.rb
b/www/board/agenda/views/pages/report.js.rb
index 4361e275..a3403a45 100644
--- a/www/board/agenda/views/pages/report.js.rb
+++ b/www/board/agenda/views/pages/report.js.rb
@@ -324,7 +324,7 @@ class Report < Vue
# expand president's attachments
def president_attachments(text)
- match = text.match(/Additionally, please see Attachments (\d) through
(\d)/)
+ match = text.match(/Additionally, please see Attachments (\d) through
(\d\d?)\./)
if match
agenda = Agenda.index
for i in 0...agenda.length