diff --git a/BrainPortal/app/controllers/portal_controller.rb b/BrainPortal/app/controllers/portal_controller.rb index fdb65b600..526837ddf 100644 --- a/BrainPortal/app/controllers/portal_controller.rb +++ b/BrainPortal/app/controllers/portal_controller.rb @@ -46,6 +46,20 @@ def welcome #:nodoc: @default_data_provider = DataProvider.find_by_id(current_user.meta["pref_data_provider_id"]) @default_bourreau = Bourreau.find_by_id(current_user.meta["pref_bourreau_id"]) + @tools = Tool + .all + .order(:name) + .to_a + .reject { |t| t.category == 'background' } + .select { |t| t.tool_configs.to_a.any? { |tc| + tc.bourreau_id.present? && + tc.bourreau_id > 0 && + tc.version_name.present? + } + } + + @avaiable_tools = @tools + @dashboard_messages = Message .where(:message_type => 'cbrain_dashboard') .order("created_at desc") diff --git a/BrainPortal/app/views/portal/welcome.html.erb b/BrainPortal/app/views/portal/welcome.html.erb index 5a0a64a3a..b7e545898 100644 --- a/BrainPortal/app/views/portal/welcome.html.erb +++ b/BrainPortal/app/views/portal/welcome.html.erb @@ -167,14 +167,14 @@ Your current time: <%= to_localtime(Time.now, :datetime) %>

- Projects you belong to: <%= array_to_table(@groups, :table_class => 'simple', :cols => 4) { |g,r,c| link_to_group_if_accessible(g) } %> + Tools available to you ( out of <%= link_to @tools.count , available_path %> ) :
+ <%= array_to_table(current_user.available_tools.where( "category <> 'background'" ).to_a.map(&:name).sort, :table_class => 'simple', :cols => 4) %>

- Tools available to you:
- <%= array_to_table(current_user.available_tools.where( "category <> 'background'" ).to_a.map(&:name).sort, :table_class => 'simple', :cols => 4) %> + Note: The full list of all tools and curated datasets is <%= link_to 'here', available_path %>

- Note: A full list of all tools and datasets is <%= link_to 'here', available_path %> + Projects you belong to: <%= array_to_table(@groups, :table_class => 'simple', :cols => 4) { |g,r,c| link_to_group_if_accessible(g) } %>

Your default Data Provider: <%= link_to_data_provider_if_accessible(@default_data_provider) %>