You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2022/04/20 11:46:40 UTC
[whimsy] branch master updated: Also show notes
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 2d000437 Also show notes
2d000437 is described below
commit 2d000437f8abfba16e5231fed8ea1fbc39adb389
Author: Sebb <se...@apache.org>
AuthorDate: Wed Apr 20 12:46:30 2022 +0100
Also show notes
---
www/secretary/workbench/models/mailbox.rb | 3 +--
www/secretary/workbench/views/index.js.rb | 16 +++++++---------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/www/secretary/workbench/models/mailbox.rb b/www/secretary/workbench/models/mailbox.rb
index 801f19f8..8c5a43d8 100644
--- a/www/secretary/workbench/models/mailbox.rb
+++ b/www/secretary/workbench/models/mailbox.rb
@@ -183,8 +183,7 @@ class Mailbox
status: message[:status]
}
if message[:secmail]
- status = message[:secmail][:status]
- entry[:secmail_status] = status if status
+ entry[:secmail] = message[:secmail]
end
entry
end
diff --git a/www/secretary/workbench/views/index.js.rb b/www/secretary/workbench/views/index.js.rb
index 41a61aa1..662433bf 100644
--- a/www/secretary/workbench/views/index.js.rb
+++ b/www/secretary/workbench/views/index.js.rb
@@ -54,16 +54,14 @@ class Index < Vue
_td message.from
if %i[emeritusReady emeritusPending].include? message.status
_td message.subject, class: message.status
- else
- if message.secmail_status
- _td do
- _ message.subject
- _ ' - '
- _b message.secmail_status
- end
- else
- _td message.subject
+ elsif message.secmail
+ _td do
+ _ message.subject
+ _ ' - '
+ _b message.secmail.inspect # TODO better presentation of content
end
+ else
+ _td message.subject
end
end
end