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: Post/Edit discussion items - fix WHIMSY-181
Date Mon, 12 Feb 2018 00:24:54 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 c3f63d3  Post/Edit discussion items - fix WHIMSY-181
c3f63d3 is described below

commit c3f63d340b98cb58013d866fc4714108fb2df4ca
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Sun Feb 11 19:23:15 2018 -0500

    Post/Edit discussion items - fix WHIMSY-181
---
 www/board/agenda/views/actions/post.json.rb |  4 ++++
 www/board/agenda/views/buttons/post.js.rb   | 12 ++++++++++++
 www/board/agenda/views/models/agenda.js.rb  | 10 ++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/www/board/agenda/views/actions/post.json.rb b/www/board/agenda/views/actions/post.json.rb
index c6b3534..2a32985 100644
--- a/www/board/agenda/views/actions/post.json.rb
+++ b/www/board/agenda/views/actions/post.json.rb
@@ -55,6 +55,10 @@ Agenda.update(@agenda, @message) do |agenda|
       title = item['fulltitle'] || item['title']
       pattern = /(^\s+#{@attach[-1]}\.\s+#{title})\n.*?\n( {1,6}\w\.)/m
       @report.gsub! /^(.)/, '       \1'
+    elsif @attach == '8.'
+      title = 'Discussion Items'
+      pattern = /^(\s8\. #{title})\n.*\n( 9\.)/m
+      @report.gsub! /^(.)/, '    \1'
     else
       pattern = /(---\nAttachment #{@attach}:.*?\[.*?\])\n.*?\n(-{40})/m
       spacing = "\n\n\n"
diff --git a/www/board/agenda/views/buttons/post.js.rb b/www/board/agenda/views/buttons/post.js.rb
index 0218f30..ab4b3b4 100644
--- a/www/board/agenda/views/buttons/post.js.rb
+++ b/www/board/agenda/views/buttons/post.js.rb
@@ -112,6 +112,16 @@ class Post < Vue
       @header = 'Edit Resolution'
       @label = 'resolution'
       @message = "Edit #{@@item.title} Resolution"
+
+    when 'post items'
+      @header = 'Post Discussion Items'
+      @label = 'items'
+      @message = "Post Discussion Items"
+
+    when 'edit items'
+      @header = 'Edit Discussion Items'
+      @label = 'items'
+      @message = "Edit Discussion Items"
     end
 
     if not @edited
@@ -134,6 +144,8 @@ class Post < Vue
 
     if @@button.text == 'add resolution' or @@item.attach =~ /^[47]/
       @indent = '        '
+    elsif @@item.attach == '8.'
+      @indent = '    '
     else
       @indent = ''
     end
diff --git a/www/board/agenda/views/models/agenda.js.rb b/www/board/agenda/views/models/agenda.js.rb
index 446a732..e8589cb 100644
--- a/www/board/agenda/views/models/agenda.js.rb
+++ b/www/board/agenda/views/models/agenda.js.rb
@@ -438,9 +438,15 @@ class Agenda
 
     list << {button: Attend} if @title == 'Roll Call'
 
-    if @attach =~ /^(\d|7?[A-Z]+|4[A-Z])$/
+    if @attach =~ /^(\d|7?[A-Z]+|4[A-Z]|8\.)$/
       if User.role == :secretary or not Minutes.complete
-        if self.missing
+        if @attach == '8.'
+          if self.missing
+            list << {form: Post, text: 'post items'}
+          else
+            list << {form: Post, text: 'edit items'}
+          end
+        elsif self.missing
           list << {form: Post, text: 'post report'}
         elsif @attach =~ /^7\w/
           list << {form: Post, text: 'edit resolution'}

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

Mime
View raw message