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 761524c should be an assignment operator, not a comparison 761524c is described below commit 761524c4d1d209a5092e6be78d2ad52ab15e1c99 Author: Sam Ruby <ru...@intertwingly.net> AuthorDate: Sat Apr 7 12:28:39 2018 -0400 should be an assignment operator, not a comparison --- www/board/agenda/views/buttons/post.js.rb | 9 +++++++-- www/board/agenda/views/models/agenda.js.rb | 12 +++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/www/board/agenda/views/buttons/post.js.rb b/www/board/agenda/views/buttons/post.js.rb index f7818cc..5013c3f 100644 --- a/www/board/agenda/views/buttons/post.js.rb +++ b/www/board/agenda/views/buttons/post.js.rb @@ -144,7 +144,7 @@ class Post < Vue _h4 @header #input field: title - if @header == 'Add Resolution' + if @header == 'Add Resolution' or @header == 'Post Discussion Item' _input.post_report_title! label: 'title', disabled: @disabled, placeholder: 'title', value: @title, onFocus: self.default_title end @@ -229,7 +229,7 @@ class Post < Vue end end - Post.header == @header + Post.header = @header end # initialize form title, etc. @@ -260,6 +260,11 @@ class Post < Vue @label = 'resolution' @message = "Edit #{@@item.title} Resolution" + when 'post item' + @header = 'Post Discussion Item' + @label = 'discussion item' + @message = "Post Discussion Item" + when 'post items' @header = 'Post Discussion Items' @label = 'items' diff --git a/www/board/agenda/views/models/agenda.js.rb b/www/board/agenda/views/models/agenda.js.rb index 49c3f24..d27546b 100644 --- a/www/board/agenda/views/models/agenda.js.rb +++ b/www/board/agenda/views/models/agenda.js.rb @@ -438,13 +438,15 @@ class Agenda list << {button: Attend} if @title == 'Roll Call' - if @attach =~ /^(\d|7?[A-Z]+|4[A-Z]|8\.)$/ + if @attach =~ /^(\d|7?[A-Z]+|4[A-Z]|8[.A-Z])$/ if User.role == :secretary or not Minutes.complete - if @attach == '8.' - if self.missing - list << {form: Post, text: 'post items'} - else + if @attach.start_with? '8' + if @text.strip().empty? + list << {form: Post, text: 'post item'} + elsif @attach =='8.' list << {form: Post, text: 'edit items'} + else + list << {form: Post, text: 'edit item'} end elsif self.missing list << {form: Post, text: 'post report'} -- To stop receiving notification emails like this one, please contact ru...@apache.org.