[whimsy] branch mod-gui updated: Merge two message body retrieval URLs

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch mod-gui
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/mod-gui by this push:
     new 0dc1be5  Merge two message body retrieval URLs
0dc1be5 is described below

commit 0dc1be560bfeb8b81bd74b352ab5920503f50d70
Author: Sebb <se...@apache.org>
AuthorDate: Sun Jan 20 09:50:24 2019 +0000

    Merge two message body retrieval URLs
---
 www/moderation/desk/server.rb            | 15 ++-------------
 www/moderation/desk/views/messages.js.rb |  2 +-
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/www/moderation/desk/server.rb b/www/moderation/desk/server.rb
index d88e0f2..4c1db20 100644
--- a/www/moderation/desk/server.rb
+++ b/www/moderation/desk/server.rb
@@ -120,7 +120,7 @@ get %r{/(#{MBOX_RE})} do |mbox|
   _json Mailbox.new(mbox, @domains).client_headers
 end
 
-# retrieve a single message (same as body now)
+# message body for a single message
 get %r{/(#{MBOX_RE})/(#{HASH_RE})/} do |mbox, hash|
   @message = Mailbox.new(mbox).find(hash)
   return [404, {}, 'Message not found or is not accessible'] unless @message
@@ -128,7 +128,7 @@ get %r{/(#{MBOX_RE})/(#{HASH_RE})/} do |mbox, hash|
   @headers = @message.headers.dup
   @headers.delete :attachments
   @cssmtime = File.mtime('public/secmail.css').to_i
-  _html :body #:message # must agree with views/*.html.rb
+  _html :body # uses view/body.html.rb
 end
 
 # posted actions
@@ -148,17 +148,6 @@ patch %r{/(#{MBOX_RE})/(#{HASH_RE})/} do |mbox, hash|
   [204, {}, '']
 end
 
-# message body for a single message
-get %r{/(#{MBOX_RE})/(#{HASH_RE})/_body_} do |mbox, hash|
-  @message = Mailbox.new(mbox).find(hash)
-  return [404, {}, 'Message not found or is not accessible'] unless @message
-  @attachments = @message.attachments
-  @headers = @message.headers.dup
-  @headers.delete :attachments
-  @cssmtime = File.mtime('public/secmail.css').to_i
-  _html :body # uses view/body.html.rb
-end
-
 # header data for a single message
 get %r{/(#{MBOX_RE})/(#{HASH_RE})/_headers_} do |mbox, hash|
   @headers = Mailbox.new(mbox).headers(hash)
diff --git a/www/moderation/desk/views/messages.js.rb b/www/moderation/desk/views/messages.js.rb
index bfb8cc9..42c81c0 100644
--- a/www/moderation/desk/views/messages.js.rb
+++ b/www/moderation/desk/views/messages.js.rb
@@ -47,7 +47,7 @@ class Messages < Vue
 
             _tr row_options do
               _td :id => message.href do # Id needed for mouse selection
-                _a message.subject, href: "#{message.href}_body_", target: 'content'
+                _a message.subject, href: "#{message.href}", target: 'content'
 #                _ message.subject
                 _br
                 _ message.from