diff options
| author | Christoph Helma <helma@in-silico.ch> | 2011-05-16 14:44:38 +0000 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2011-05-16 14:44:38 +0000 |
| commit | 57b276f2d91bb3452f07c2e0d1803ced5ff1b35d (patch) | |
| tree | a964d996b331776b7f5a14b28e43a47606295d09 | |
| parent | 778df38c0991aef8de53702e8c6229dd6f43d1a2 (diff) | |
| parent | 5acd3b8cd36a0f5017e4858df3d4516876858324 (diff) | |
Merge branch 'development' of github.com:opentox/opentox-ruby into development
| -rw-r--r-- | Rakefile | 2 | ||||
| -rw-r--r-- | lib/authorization.rb | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -53,7 +53,7 @@ begin #valiation-gem gem.add_dependency "haml", ">=3" # validation-gems - gem.add_dependency "ruby-plot", "~>0.3.0" + gem.add_dependency "ruby-plot", "~>0.4.0" ['jeweler'].each { |dep| gem.add_development_dependency dep } gem.files = FileList["[A-Z]*", "{bin,generators,lib,test}/**/*", 'lib/jeweler/templates/.gitignore'] end diff --git a/lib/authorization.rb b/lib/authorization.rb index b23b92f..288733a 100644 --- a/lib/authorization.rb +++ b/lib/authorization.rb @@ -227,7 +227,9 @@ module OpenTox begin resource = RestClient::Resource.new("#{AA_SERVER}/opensso/identity/search") grps = resource.post(:admin => subjectid, :attributes_names => "objecttype", :attributes_values_objecttype => "group") - grps.split("\n").collect{|x| x.sub("string=","")} + grps = grps.split("\n").collect{|x| x.sub("string=","")} + grps.delete_if{|g|g=="MemberManagement"||g=="Webmasters"} + grps rescue [] end |