[whimsy] branch master updated: Podlings no longer have unix groups; don't count apldap in roster

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb 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 07440ee  Podlings no longer have unix groups; don't count apldap in 
roster
07440ee is described below

commit 07440ee440e7a9f8653a2db06017bd6b7da70dce
Author: Sebb <s...@apache.org>
AuthorDate: Wed Mar 13 23:04:03 2019 +0000

    Podlings no longer have unix groups; don't count apldap in roster
---
 www/roster/main.rb              |  1 -
 www/roster/models/group.rb      |  2 +-
 www/roster/views/groups.html.rb | 11 -----------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/www/roster/main.rb b/www/roster/main.rb
index c664554..d99c2d5 100755
--- a/www/roster/main.rb
+++ b/www/roster/main.rb
@@ -174,7 +174,6 @@ end
 
 get '/group/' do
   @groups = Group.list
-  @podlings = ASF::Podling.to_h
   _html :groups
 end
 
diff --git a/www/roster/models/group.rb b/www/roster/models/group.rb
index 8de7346..212cbf2 100644
--- a/www/roster/models/group.rb
+++ b/www/roster/models/group.rb
@@ -10,7 +10,7 @@ class Group
     groups.map! {|group| [group, "LDAP group"]}
 
     # add services...
-    groups += ASF::Service.listcns.map {|service| [service, "LDAP service"]}
+    groups += ASF::Service.listcns.reject{|s| s=='apldap'}.map {|service| 
[service, "LDAP service"]}
 
     # add authorization (asf and pit)
     groups += ASF::Authorization.new('asf').to_h.
diff --git a/www/roster/views/groups.html.rb b/www/roster/views/groups.html.rb
index 446fb19..4004e31 100644
--- a/www/roster/views/groups.html.rb
+++ b/www/roster/views/groups.html.rb
@@ -59,7 +59,6 @@ _html do
             _tr do
               _th.sorting_asc 'Name', data_sort: 'string-ins'
               _th 'Group type', data_sort: 'string'
-              _th 'Notes', data_sort: 'notes'
             end
           end
 
@@ -69,16 +68,6 @@ _html do
               _tr_ do
                 _td {_a name, href: "group/#{name}"}
                 _td type
-
-                if @podlings[name]
-                  if @podlings[name].status == 'retired'
-                    _td.issue "retired podling"
-                  else
-                    _td "#{@podlings[name].status} podling"
-                  end
-                else
-                  _td
-                end
               end
             end
           end