[whimsy] branch master updated: disable commit once meeting is done or minutes have been posted

[ru...@apache.org]

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 70eee29  disable commit once meeting is done or minutes have been posted
70eee29 is described below

commit 70eee29907f05ae8efc203ec124c14ed07d1a142
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Mon May 28 10:44:29 2018 -0400

    disable commit once meeting is done or minutes have been posted
---
 www/board/agenda/views/buttons/commit.js.rb | 2 +-
 www/board/agenda/views/models/agenda.js.rb  | 4 ++--
 www/board/agenda/views/models/minutes.js.rb | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/www/board/agenda/views/buttons/commit.js.rb b/www/board/agenda/views/buttons/commit.js.rb
index 95ce95a..db10288 100644
--- a/www/board/agenda/views/buttons/commit.js.rb
+++ b/www/board/agenda/views/buttons/commit.js.rb
@@ -13,7 +13,7 @@ class Commit < Vue
     {
       text: 'commit',
       class: 'btn_primary',
-      disabled: Server.offline,
+      disabled: Server.offline || Minutes.complete || Minutes.draft_posted,
       data_toggle: 'modal',
       data_target: '#commit-form'
     }
diff --git a/www/board/agenda/views/models/agenda.js.rb b/www/board/agenda/views/models/agenda.js.rb
index 25054c5..18c8674 100644
--- a/www/board/agenda/views/models/agenda.js.rb
+++ b/www/board/agenda/views/models/agenda.js.rb
@@ -491,7 +491,7 @@ class Agenda
 
     if @attach =~ /^(\d|7?[A-Z]+|4[A-Z]|8[.A-Z])$/
       if User.role == :secretary or not Minutes.complete
-        unless Server.drafts.include? Agenda.file.sub('_agenda_', '_minutes_')
+        unless Minutes.draft_posted
 	  if @attach =~ /^8[.A-Z]/
 	    if @attach =~ /^8[A-Z]/
 	      list << {form: Post, text: 'edit item'}
@@ -517,7 +517,7 @@ class Agenda
       end
 
     elsif User.role == :secretary
-      unless Server.drafts.include? Agenda.file.sub('_agenda_', '_minutes_')
+      unless Minutes.draft_posted
         if @attach =~ /^7\w/
           list << {form: Vote}
         elsif Minutes.get(@title)
diff --git a/www/board/agenda/views/models/minutes.js.rb b/www/board/agenda/views/models/minutes.js.rb
index 02d9eee..9abb609 100644
--- a/www/board/agenda/views/models/minutes.js.rb
+++ b/www/board/agenda/views/models/minutes.js.rb
@@ -87,6 +87,11 @@ class Minutes
       not Server.drafts.include?  Agenda.file.sub('_agenda_', '_minutes_')
   end
 
+  # determine if the draft is ready
+  def self.draft_posted
+    Server.drafts.include?  Agenda.file.sub('_agenda_', '_minutes_')
+  end
+
   # determine if committers summary has been sent
   def self.summary_sent
     @@list.todos and @@list.todos.summary_sent

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