[whimsy] branch master updated: additional text on flagging checkbox

[br...@apache.org]

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

brett 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 11aa610  additional text on flagging checkbox
11aa610 is described below

commit 11aa610026ba59994bdd4aacba4a750c87ef4f50
Author: Brett Porter <br...@apache.org>
AuthorDate: Sun Jul 23 22:51:38 2017 +1000

    additional text on flagging checkbox
    
    Make it clear that flagging the report is for either discussion or ensuring
    that there is follow up on the comment
---
 www/board/agenda/spec/reports_spec.rb            | 2 +-
 www/board/agenda/views/buttons/add-comment.js.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/board/agenda/spec/reports_spec.rb b/www/board/agenda/spec/reports_spec.rb
index bbf3828..1c58870 100644
--- a/www/board/agenda/spec/reports_spec.rb
+++ b/www/board/agenda/spec/reports_spec.rb
@@ -69,7 +69,7 @@ feature 'report' do
     expect(page).to have_selector '.modal .modal-dialog .modal-header h4',
       text: 'Edit comment'
     expect(page).to have_selector 'input[id=flag][type=checkbox]'
-    expect(page).to have_selector 'span', text: 'item requires discussion'
+    expect(page).to have_selector 'span', text: 'item requires discussion or follow up'
     expect(page).to have_selector '.modal .modal-dialog .modal-header h4',
       text: 'Edit Report'
     expect(page).to have_selector '#post-report-text',
diff --git a/www/board/agenda/views/buttons/add-comment.js.rb b/www/board/agenda/views/buttons/add-comment.js.rb
index 1c993b4..2445424 100644
--- a/www/board/agenda/views/buttons/add-comment.js.rb
+++ b/www/board/agenda/views/buttons/add-comment.js.rb
@@ -45,7 +45,7 @@ class AddComment < React
         disabled: @disabled
 
       if Server.role == :director and @@item.attach =~ /^[A-Z]+$/
-        _input.flag! type: 'checkbox', label: 'item requires discussion',
+        _input.flag! type: 'checkbox', label: 'item requires discussion or follow up',
           onChange: self.flag, checked: @checked
       end
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].