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 57cae52  more cleanup
57cae52 is described below

commit 57cae52b0fe51a82eea862dd56c704357ffc50c9
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Apr 7 18:50:01 2018 -0400

    more cleanup
---
 www/board/agenda/views/buttons/post.js.rb | 4 +---
 www/board/agenda/views/router.js.rb       | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/www/board/agenda/views/buttons/post.js.rb 
b/www/board/agenda/views/buttons/post.js.rb
index 284f5da..58c6e66 100644
--- a/www/board/agenda/views/buttons/post.js.rb
+++ b/www/board/agenda/views/buttons/post.js.rb
@@ -196,8 +196,6 @@ class Post < Vue
       initialize_terminate_project()
     elsif @button == 'Out of Cycle Report'
       initialize_out_of_cycle()
-    elsif @button == 'Discussion Item'
-      @header = 'Add Discussion Item'
     end
 
     retitle()
@@ -267,7 +265,7 @@ class Post < Vue
       @label = 'resolution'
       @title = ''
 
-    when 'post item'
+    when 'post item', 'Discussion Item'
       @header = 'Add Discussion Item'
       @label = 'discussion item'
       @message = "Add Discussion Item"
diff --git a/www/board/agenda/views/router.js.rb 
b/www/board/agenda/views/router.js.rb
index dcbedb8..97c675e 100644
--- a/www/board/agenda/views/router.js.rb
+++ b/www/board/agenda/views/router.js.rb
@@ -96,10 +96,10 @@ class Router
 
     elsif path == 'Discussion-Items'
 
+      item = nil
       Agenda.index.each do |i|
         if i.attach =~ /^8[.A-Z]/
-          item = i
-          break
+          item = i unless item
         end
       end
 

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

Reply via email to