[ARVADOS] updated: af8e85324d376f47009c3abee00345188cc2f205
git at public.curoverse.com
git at public.curoverse.com
Wed Aug 12 10:15:03 EDT 2015
Summary of changes:
.../app/views/application/_projects_tree_menu.html.erb | 3 +++
apps/workbench/app/views/layouts/body.html.erb | 18 ++++++++++++++----
2 files changed, 17 insertions(+), 4 deletions(-)
via af8e85324d376f47009c3abee00345188cc2f205 (commit)
from 1f20939e2c8673bbd3774d6ef7e2f075a12abe5a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit af8e85324d376f47009c3abee00345188cc2f205
Author: Manoj <jonam33 at gmail.com>
Date: Wed Aug 12 10:14:29 2015 -0400
6640: Search button now only shows projects.
diff --git a/apps/workbench/app/views/application/_projects_tree_menu.html.erb b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
index f9a6f9f..77b9d45 100644
--- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb
+++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
@@ -1,3 +1,6 @@
+<li role="presentation" class="dropdown-header">
+ My projects
+</li>
<li>
<%= project_link_to.call({object: current_user, depth: 0}) do %>
<span style="padding-left: 0">Home</span>
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 10c2c08..7ea7743 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -201,7 +201,20 @@
<span class="caret"></span>
</a>
<ul class="dropdown-menu" style="min-width: 20em" role="menu">
- <li role="menuitem"><a href="/projects/public" role="menuitem"><i class="glyphicon fa-fw glyphicon-search"></i> Search all projects </a>
+ <li role="menuitem">
+ <%= link_to(
+ url_for(
+ action: 'choose',
+ controller: 'search',
+ filters: [['uuid', 'is_a', 'arvados#group']].to_json,
+ title: 'Search',
+ action_name: 'Show',
+ action_href: url_for(controller: :actions, action: :show),
+ action_method: 'get',
+ action_data: {selection_param: 'uuid', success: 'redirect-to-created-object', copy_from_search_box: true}.to_json),
+ { remote: true, method: 'get', title: "Search" }) do %>
+ <i class="glyphicon fa-fw glyphicon-search"></i> Search all projects
+ <% end %>
</li>
<% if Rails.configuration.anonymous_user_token and Rails.configuration.enable_public_projects_page %>
<li role="menuitem"><a href="/projects/public" role="menuitem"><i class="fa fa-fw fa-list"></i> Browse public projects </a>
@@ -213,9 +226,6 @@
<% end %>
</li>
<li role="presentation" class="divider"></li>
- <li role="presentation" class="dropdown-header">
- My projects
- </li>
<%= render partial: "projects_tree_menu", locals: {
:project_link_to => Proc.new do |pnode, &block|
link_to(project_path(pnode[:object].uuid),
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list