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: update feedback sent, and return to the adjournment page
Date Thu, 19 Apr 2018 12:08:08 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 b9e1ad1  update feedback sent, and return to the adjournment page
b9e1ad1 is described below

commit b9e1ad11b5f32aa1a6449f68f536e44656dda5c3
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Thu Apr 19 08:07:48 2018 -0400

    update feedback sent, and return to the adjournment page
---
 www/board/agenda/views/actions/feedback.json.rb | 2 +-
 www/board/agenda/views/pages/feedback.js.rb     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/board/agenda/views/actions/feedback.json.rb b/www/board/agenda/views/actions/feedback.json.rb
index a9ac3be..358f33a 100644
--- a/www/board/agenda/views/actions/feedback.json.rb
+++ b/www/board/agenda/views/actions/feedback.json.rb
@@ -91,7 +91,7 @@ Agenda.parse(@agenda, :full).each do |item|
   output << {
     attach: item[:attach],
     title: item['title'],
-    sent: feedback_sent && feedback_sent.include?(item['title']),
+    sent: not @dryrun,
     mail: mail.to_s
   }
 end
diff --git a/www/board/agenda/views/pages/feedback.js.rb b/www/board/agenda/views/pages/feedback.js.rb
index 738a20f..ec3551b 100644
--- a/www/board/agenda/views/pages/feedback.js.rb
+++ b/www/board/agenda/views/pages/feedback.js.rb
@@ -104,6 +104,9 @@ class SendFeedback < Vue
         @list = json
         EventBus.emit :potential_feedback, @list
         @disabled = false
+
+        # return to the Adjournment page
+        Main.navigate 'Adjournment'
       end
     end
   end

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

Mime
View raw message