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 c7d3918 continue to split out user specific data from common server
data
c7d3918 is described below
commit c7d39186730ff4500dec10d8fbc0f3c5a99ffb73
Author: Sam Ruby <[email protected]>
AuthorDate: Sat Nov 18 16:07:45 2017 -0500
continue to split out user specific data from common server data
---
www/board/agenda/views/buttons/add-comment.js.rb | 2 +-
www/board/agenda/views/keyboard.js.rb | 2 +-
www/board/agenda/views/models/agenda.js.rb | 12 ++++++------
www/board/agenda/views/models/pending.js.rb | 13 +++++++++++++
www/board/agenda/views/pages/fy23.js.rb | 6 +++---
www/board/agenda/views/pages/help.js.rb | 4 ++--
www/board/agenda/views/pages/queue.js.rb | 4 ++--
www/board/agenda/views/router.js.rb | 2 +-
8 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/www/board/agenda/views/buttons/add-comment.js.rb
b/www/board/agenda/views/buttons/add-comment.js.rb
index dd8cf6f..14a846c 100644
--- a/www/board/agenda/views/buttons/add-comment.js.rb
+++ b/www/board/agenda/views/buttons/add-comment.js.rb
@@ -43,7 +43,7 @@ class AddComment < Vue
_textarea.comment_text! value: @comment, label: 'Comment',
placeholder: 'comment', rows: 5, disabled: @disabled
- if Server.role == :director and @@item.attach =~ /^[A-Z]+$/
+ if Pending.role == :director and @@item.attach =~ /^[A-Z]+$/
_input.flag! type: 'checkbox',
label: 'item requires discussion or follow up',
onClick: self.flag, checked: @checked
diff --git a/www/board/agenda/views/keyboard.js.rb
b/www/board/agenda/views/keyboard.js.rb
index f0d3892..67114a6 100644
--- a/www/board/agenda/views/keyboard.js.rb
+++ b/www/board/agenda/views/keyboard.js.rb
@@ -51,7 +51,7 @@ class Keyboard
return false
elsif event.keyCode == 'S'.ord
if event.shiftKey
- Server.role = :secretary
+ Pending.role = :secretary
Main.refresh()
else
link = ~"#shepherd"[0]
diff --git a/www/board/agenda/views/models/agenda.js.rb
b/www/board/agenda/views/models/agenda.js.rb
index b152a0e..196874b 100644
--- a/www/board/agenda/views/models/agenda.js.rb
+++ b/www/board/agenda/views/models/agenda.js.rb
@@ -252,7 +252,7 @@ class Agenda
list << {form: Post, text: 'add resolution'}
end
- if Server.role == :secretary
+ if Pending.role == :secretary
if Server.drafts.include? Agenda.file.sub('agenda', 'minutes')
list << {form: PublishMinutes}
elsif Minutes.ready_to_post_draft
@@ -405,9 +405,9 @@ class Agenda
else
SelectActions
end
- elsif @title == 'Roll Call' and Server.role == :secretary
+ elsif @title == 'Roll Call' and Pending.role == :secretary
RollCall
- elsif @title == 'Adjournment' and Server.role == :secretary
+ elsif @title == 'Adjournment' and Pending.role == :secretary
Adjournment
else
Report
@@ -430,7 +430,7 @@ class Agenda
list << {button: Attend} if @title == 'Roll Call'
if @attach =~ /^(\d|7?[A-Z]+|4[A-Z])$/
- if Server.role == :secretary or not Minutes.complete
+ if Pending.role == :secretary or not Minutes.complete
if self.missing
list << {form: Post, text: 'post report'}
elsif @attach =~ /^7\w/
@@ -441,12 +441,12 @@ class Agenda
end
end
- if Server.role == :director
+ if Pending.role == :director
unless self.missing or @comments === undefined or Minutes.complete
list << {button: Approve}
end
- elsif Server.role == :secretary
+ elsif Pending.role == :secretary
if @attach =~ /^7\w/
list << {form: Vote}
elsif Minutes.get(@title)
diff --git a/www/board/agenda/views/models/pending.js.rb
b/www/board/agenda/views/models/pending.js.rb
index aaa61c2..1263313 100644
--- a/www/board/agenda/views/models/pending.js.rb
+++ b/www/board/agenda/views/models/pending.js.rb
@@ -24,6 +24,7 @@ class Pending
end
def self.load(value)
+ value.role = Server.pending.role if Server.pending and Server.pending.role
Server.pending = value if value
Main.refresh()
return value
@@ -79,6 +80,18 @@ class Pending
Server.pending.username || Server.username
end
+ def self.role
+ if Server.pending and Server.pending.role
+ Server.pending.role
+ else
+ Server.role
+ end
+ end
+
+ def self.role=(role)
+ Server.pending.role = role
+ end
+
def self.status
Server.pending.status || []
end
diff --git a/www/board/agenda/views/pages/fy23.js.rb
b/www/board/agenda/views/pages/fy23.js.rb
index 2fd392e..113f20d 100644
--- a/www/board/agenda/views/pages/fy23.js.rb
+++ b/www/board/agenda/views/pages/fy23.js.rb
@@ -17,7 +17,7 @@ class FY23 < Vue
chairman: 10,
}
- if Server.role == :secretary or not Minutes.started
+ if Pending.role == :secretary or not Minutes.started
@disabled = false
else
@disabled = true
@@ -292,7 +292,7 @@ class FY23 < Vue
event.target.value = @budget[event.target.id].toLocaleString()
self.recalc()
- if Server.role == :secretary and Minutes.started
+ if Pending.role == :secretary and Minutes.started
post 'budget', agenda: Agenda.file, budget: @budget do |budget|
@budget = budget if budget
end
@@ -319,7 +319,7 @@ class FY23 < Vue
end
@budget = budget
- @disabled = true unless Server.role == :secretary
+ @disabled = true unless Pending.role == :secretary
end
end
end
diff --git a/www/board/agenda/views/pages/help.js.rb
b/www/board/agenda/views/pages/help.js.rb
index 091dddd..b7ac828 100644
--- a/www/board/agenda/views/pages/help.js.rb
+++ b/www/board/agenda/views/pages/help.js.rb
@@ -56,7 +56,7 @@ class Help < Vue
%w(Secretary Director Guest).each do |role|
_div do
_input type: 'radio', name: 'role', value: role.downcase(),
- checked: role.downcase() == Server.role, onChange: self.setRole
+ checked: role.downcase() == Pending.role, onChange: self.setRole
_ role
end
end
@@ -64,7 +64,7 @@ class Help < Vue
end
def setRole(event)
- Server.role = event.target.value
+ Pending.role = event.target.value
Main.refresh()
end
end
diff --git a/www/board/agenda/views/pages/queue.js.rb
b/www/board/agenda/views/pages/queue.js.rb
index 8984d1b..12835c1 100644
--- a/www/board/agenda/views/pages/queue.js.rb
+++ b/www/board/agenda/views/pages/queue.js.rb
@@ -13,7 +13,7 @@ class Queue < Vue
def render
_div.col_xs_12 do
- if Server.role == :director
+ if Pending.role == :director
# Approvals
_h4 'Approvals'
_p.col_xs_12 do
@@ -73,7 +73,7 @@ class Queue < Vue
end
# Ready
- if Server.role == :director and not pending.ready.empty?
+ if Pending.role == :director and not pending.ready.empty?
_div.row.col_xs_12 { _hr }
_h4 'Ready for review'
diff --git a/www/board/agenda/views/router.js.rb
b/www/board/agenda/views/router.js.rb
index 03402d3..9897f0f 100644
--- a/www/board/agenda/views/router.js.rb
+++ b/www/board/agenda/views/router.js.rb
@@ -26,7 +26,7 @@ class Router
elsif path == 'queue'
item = {view: Queue, title: 'Queued approvals and comments'}
- item.title = 'Queued comments' unless Server.role == :director
+ item.title = 'Queued comments' unless Pending.role == :director
elsif path == 'flagged'
item = {view: Flagged, title: 'Flagged reports'}
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
