Commit 0d44a5dd027f9c5b8e2d49cad892a7f915431d74:
Revert "to_h is relatively new; allow code to run on older Ruby versions"
This reverts commit 6c2b651834355a5e677906b939449e43fb6b38e3.
Branch: refs/heads/master
Author: Sebb <[email protected]>
Committer: Sebb <[email protected]>
Pusher: sebb <[email protected]>
------------------------------------------------------------
www/roster/models/group.rb | +++ --------
------------------------------------------------------------
22 changes: 6 additions, 16 deletions.
------------------------------------------------------------
diff --git a/www/roster/models/group.rb b/www/roster/models/group.rb
index 0015b1d..acc40e9 100644
--- a/www/roster/models/group.rb
+++ b/www/roster/models/group.rb
@@ -8,26 +8,16 @@ def self.list
groups = ASF::Group.list.map(&:id)
groups -= ASF::Committee.list.map(&:id)
groups.map! {|group| [group, "LDAP group"]}
+
# add services...
groups += ASF::Service.list.map {|service| [service, "LDAP service"]}
# add authorization (asf and pit)
- begin
- groups += ASF::Authorization.new('asf').to_h.
- map {|id, list| [id, "ASF Auth"]}
- rescue # in case to_h does not work
- ASF::Authorization.new('asf').each do |id,list|
- groups += [[id, "ASF Auth"]]
- end
- end
- begin
- groups += ASF::Authorization.new('pit').to_h.
- map {|id, list| [id, "PIT Auth"]}
- rescue # in case to_h does not work
- ASF::Authorization.new('pit').each do |id,list|
- groups += [[id, "PIT Auth"]]
- end
- end
+ groups += ASF::Authorization.new('asf').to_h.
+ map {|id, list| [id, "ASF Auth"]}
+
+ groups += ASF::Authorization.new('pit').to_h.
+ map {|id, list| [id, "PIT Auth"]}
groups.sort
end
