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 67021a5 provide user role in reponse to pending request
67021a5 is described below
commit 67021a50ec00cddaa5ee5ab67fe15e5b141930f6
Author: Sam Ruby <[email protected]>
AuthorDate: Sun Nov 19 15:17:10 2017 -0500
provide user role in reponse to pending request
---
www/board/agenda/models/pending.rb | 8 ++++++++
www/board/agenda/routes.rb | 10 +---------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/www/board/agenda/models/pending.rb
b/www/board/agenda/models/pending.rb
index daeb33a..f257d85 100644
--- a/www/board/agenda/models/pending.rb
+++ b/www/board/agenda/models/pending.rb
@@ -38,6 +38,14 @@ class Pending
end
end
+ if userid=='test' or ASF::Service['board'].members.map(&:id).include?
userid
+ response['role'] = :director
+ elsif ASF::Service['asf-secretary'].members.map(&:id).include? userid
+ response['role'] = :secretary
+ else
+ response['role'] = :guest
+ end
+
response['username'] ||= username
response['initials'] ||= username.gsub(/[^A-Z]/, '').downcase
response['firstname'] ||= username.split(' ').first.downcase
diff --git a/www/board/agenda/routes.rb b/www/board/agenda/routes.rb
index b1a4745..6ede053 100755
--- a/www/board/agenda/routes.rb
+++ b/www/board/agenda/routes.rb
@@ -125,14 +125,6 @@ get %r{/(\d\d\d\d-\d\d-\d\d)/(.*)} do |date, path|
pending = Pending.get(userid)
- if userid == 'test' or ASF::Service['board'].members.map(&:id).include?
userid
- role = :director
- elsif ASF::Service['asf-secretary'].members.map(&:id).include? userid
- role = :secretary
- else
- role = :guest
- end
-
# determine who is present
@present = []
@present_mtime = nil
@@ -159,7 +151,7 @@ get %r{/(\d\d\d\d-\d\d-\d\d)/(.*)} do |date, path|
initials: pending['initials'],
online: @present,
session: Session.user(userid),
- role: role,
+ role: pending['role'],
directors: Hash[ASF::Service['board'].members.map {|person|
initials = person.public_name.gsub(/[^A-Z]/, '').downcase
[initials, person.public_name.split(' ').first]
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
