[ARVADOS] updated: fa92b2cbdac98908040f650b994df0d233380903
git at public.curoverse.com
git at public.curoverse.com
Tue Jul 22 09:37:07 EDT 2014
Summary of changes:
.../app/assets/javascripts/pipeline_instances.js | 6 ++
.../app/assets/javascripts/select_modal.js | 3 +
apps/workbench/app/assets/javascripts/sizing.js | 1 +
apps/workbench/app/assets/javascripts/tab_panes.js | 38 +++++++++
.../app/controllers/collections_controller.rb | 3 +
.../app/controllers/projects_controller.rb | 44 +++++++++-
apps/workbench/app/helpers/application_helper.rb | 61 +++++++-------
apps/workbench/app/models/arvados_base.rb | 4 +
apps/workbench/app/models/arvados_resource_list.rb | 7 ++
apps/workbench/app/models/link.rb | 10 +++
.../app/views/application/_choose.html.erb | 69 ++++++++--------
.../app/views/application/_content.html.erb | 48 +----------
.../views/application/_projects_tree_menu.html.erb | 7 --
.../_choose_rows.html.erb | 5 +-
.../app/views/layouts/application.html.erb | 27 +++---
.../pipeline_instances/_show_components.html.erb | 2 +-
.../app/views/pipeline_instances/show.html.erb | 6 --
.../app/views/projects/_show_permissions.html.erb | 44 ----------
.../app/views/projects/_show_sharing.html.erb | 95 ++++++++++++++++++++++
.../_choose_rows.html.erb | 7 +-
apps/workbench/config/routes.rb | 6 +-
.../test/functional/projects_controller_test.rb | 54 ++++++++++++
apps/workbench/test/integration/projects_test.rb | 73 +++++++++++++++--
apps/workbench/test/unit/group_test.rb | 9 ++
apps/workbench/test/unit/link_test.rb | 47 ++++++++++-
apps/workbench/test/unit/user_test.rb | 8 ++
.../app/controllers/arvados/v1/links_controller.rb | 14 +++-
services/api/app/models/link.rb | 11 +++
services/api/test/fixtures/groups.yml | 11 +++
services/api/test/fixtures/links.yml | 17 ++++
services/api/test/fixtures/users.yml | 11 +++
.../functional/arvados/v1/links_controller_test.rb | 67 +++++++++++++++
services/api/test/unit/link_test.rb | 42 ++++++++++
services/fuse/arvados_fuse/__init__.py | 6 +-
services/fuse/bin/arv-mount | 59 ++++++++++----
35 files changed, 702 insertions(+), 220 deletions(-)
create mode 100644 apps/workbench/app/assets/javascripts/tab_panes.js
copy apps/workbench/app/views/{pipeline_templates => groups}/_choose_rows.html.erb (57%)
delete mode 100644 apps/workbench/app/views/projects/_show_permissions.html.erb
create mode 100644 apps/workbench/app/views/projects/_show_sharing.html.erb
copy apps/workbench/app/views/{pipeline_templates => users}/_choose_rows.html.erb (50%)
via fa92b2cbdac98908040f650b994df0d233380903 (commit)
via 889d94070d54e47ddb44afcfe457cbaed2e6a2e3 (commit)
via dd198047ab128658010869830b27ef6b83f5182e (commit)
via 589d2b599714a5e3c239aa25029f1a0a4261f520 (commit)
via 5fdfe4ca7ea91f3da518e6b20d970bf6fcd5ba8c (commit)
via e8e0eecb50f527461216631c0e8a1888afecb812 (commit)
via 7bb16e4139068847fc138a0c0375a05819e7bd00 (commit)
via d5b8f4baf23f0b79e2f9b559b1da6f8898292f9f (commit)
via e3a4fe6e461ec3ffde76e973ada7abae52faf050 (commit)
via fe8e80e434724578b29d79038a75f677df2ad400 (commit)
via 2fccbc1d172fe4bd680651261adfdca8f1ba2a63 (commit)
via 46a7d27450216b1e022d23396931aa1b46c58c73 (commit)
via 189016bba4c9c0ef2f66663dd8ff38843c8b25e1 (commit)
via 13f5b1cf8db5a63b825c3dc81520c69500376adb (commit)
via 67e443d5d1e4a6b6dfe671b3f4310258d386e4f2 (commit)
via 54050447a56ab3e019746f12eb36b026dd5d2fb0 (commit)
via 83f2087d9950975591ce5fe9c7f7c9e5db6749d9 (commit)
via 1b785fd50c259eb42cd2c8c4ba2e440d7bfe0032 (commit)
via 8d3335359e3785be35818b0c4519cc499f3f2fa8 (commit)
via 6a2406f04875497a7bfad72fc8bcd73b792fefae (commit)
via d188143b2acd99dc594231360eeaf3e178794ff8 (commit)
from 12e7019819d6e595f676eac29805b6e518733d13 (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 fa92b2cbdac98908040f650b994df0d233380903
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Jul 21 14:30:05 2014 -0400
3235: Fix errant merge.
diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index a5ff41d..8b31bb8 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -41,7 +41,6 @@
</div>
<div class="col-sm-6 modal-dialog-preview-pane" style="height: 100%; overflow-y: scroll">
</div>
- <% end %>
</div>
<div class="modal-footer">
commit 889d94070d54e47ddb44afcfe457cbaed2e6a2e3
Merge: dd19804 589d2b5
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Jul 21 14:28:17 2014 -0400
3235: Merge branch 'master' into 3235-top-nav-site-search
Conflicts:
apps/workbench/app/views/application/_choose.html.erb
diff --cc apps/workbench/app/views/application/_choose.html.erb
index e8cb807,ee8690e..a5ff41d
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@@ -12,40 -7,44 +7,41 @@@
</div>
<div class="modal-body">
- <nav class="navbar navbar-default breadcrumbs" role="navigation">
- <ul class="nav navbar-nav navbar-left">
- <li class="dropdown">
- <%= render partial: "projects_tree_menu", locals: {
- :project_link_to => Proc.new do |pnode, &block|
- link_to "#", {"class" => "chooser-show-project", "data-project-uuid" => pnode[:object].uuid }, &block
- end,
- :top_button => Proc.new do %>
- <% link_to "#", {"class" => "chooser-show-project btn btn-xs btn-default pull-right" } do %>
- All <%= controller.model_class.class_for_display.pluralize.downcase %>
- <% end %>
- <% end %>
- <% } %>
- </li>
- <li class="nav-separator">
- <i class="fa fa-lg fa-angle-double-right"></i>
- </li>
- <li><p class="navbar-text" id="chooser-breadcrumb">All <%= controller.model_class.class_for_display.pluralize.downcase %></span></li>
- </ul>
- <div class="navbar-form navbar-right">
- <input type="text" class="form-control filterable-control" placeholder="Search" data-filterable-target=".modal.arv-choose .selectable-container"/>
- </div>
- </nav>
-
- <% preview_pane = (params[:preview_pane] != "false")
- pane_col_class = preview_pane ? "col-sm-6" : "" %>
+ <div class="input-group">
+ <% if params[:by_project] %>
+ <div class="input-group-btn">
+ <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+ Projects <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu" role="menu">
+ <%= render partial: "projects_tree_menu", locals: {
+ :project_link_to => Proc.new do |pnode, &block|
+ link_to "#", {"class" => "chooser-show-project", "data-project-uuid" => pnode[:object].uuid }, &block
+ end,
+ :top_button => Proc.new do %>
+ <% link_to "#", {"class" => "chooser-show-project btn btn-xs btn-default pull-right" } do %>
+ All <%= controller.model_class.class_for_display.pluralize.downcase %>
+ <% end %>
+ <% end %>
+ <% } %>
+ <li class="divider" />
+ <li><span class="navbar-text" id="chooser-breadcrumb">All <%= controller.model_class.class_for_display.pluralize.downcase %></span></li>
+ </ul>
+ </div>
+ <% end %>
+ <input type="text" class="form-control filterable-control" placeholder="Search" data-filterable-target=".modal.arv-choose .selectable-container"/>
+ </div>
<div class="row" style="height: 20em">
- <div class="<%= pane_col_class %> container-fluid arv-filterable-list selectable-container"
- style="height: 100%; overflow-y: scroll"
- data-infinite-scroller="#choose-scroll"
- id="choose-scroll"
- data-infinite-content-href="<%= @next_page_href %>">
- <%= render partial: 'choose_rows', locals: {multiple: multiple} %>
- </div>
- <% if preview_pane %>
- <div class="<%= pane_col_class %> modal-dialog-preview-pane" style="height: 100%; overflow-y: scroll">
+ <div class="col-sm-6 container arv-filterable-list selectable-container"
+ style="height: 100%; overflow-y: scroll"
+ data-infinite-scroller="#choose-scroll"
+ id="choose-scroll"
+ data-infinite-content-href="<%= @next_page_href %>">
+ <%= render partial: 'choose_rows', locals: {multiple: multiple} %>
+ </div>
+ <div class="col-sm-6 modal-dialog-preview-pane" style="height: 100%; overflow-y: scroll">
</div>
+ <% end %>
</div>
<div class="modal-footer">
commit dd198047ab128658010869830b27ef6b83f5182e
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Jul 21 14:17:34 2014 -0400
3235: Fix project dropdown, use it when choosing collections.
diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 5a7a522..8547819 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -43,6 +43,9 @@ class CollectionsController < ApplicationController
end
def choose
+ # Always offer a Projects dropdown when choosing collections.
+ params[:by_project] = true
+
params[:limit] ||= 40
filter = [['link_class','=','name'],
diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index 07edb47..e8cb807 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -12,41 +12,38 @@
</div>
<div class="modal-body">
- <% if params[:by_project] %>
- <div class="btn-group">
- <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
- Projects <span class="caret"></span>
- </button>
- <%= render partial: "projects_tree_menu", locals: {
- :project_link_to => Proc.new do |pnode, &block|
- link_to "#", {"class" => "chooser-show-project", "data-project-uuid" => pnode[:object].uuid }, &block
- end,
- :top_button => Proc.new do %>
- <% link_to "#", {"class" => "chooser-show-project btn btn-xs btn-default pull-right" } do %>
- All <%= controller.model_class.class_for_display.pluralize.downcase %>
- <% end %>
- <% end %>
- <% } %>
- </li>
- <li class="nav-separator">
- <i class="fa fa-lg fa-angle-double-right"></i>
- </li>
- <li><p class="navbar-text" id="chooser-breadcrumb">All <%= controller.model_class.class_for_display.pluralize.downcase %></span></li>
- </ul>
- <div class="navbar-form navbar-right">
- <input type="text" class="form-control filterable-control" placeholder="Search" data-filterable-target=".modal.arv-choose .selectable-container"/>
- </div>
+ <div class="input-group">
+ <% if params[:by_project] %>
+ <div class="input-group-btn">
+ <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+ Projects <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu" role="menu">
+ <%= render partial: "projects_tree_menu", locals: {
+ :project_link_to => Proc.new do |pnode, &block|
+ link_to "#", {"class" => "chooser-show-project", "data-project-uuid" => pnode[:object].uuid }, &block
+ end,
+ :top_button => Proc.new do %>
+ <% link_to "#", {"class" => "chooser-show-project btn btn-xs btn-default pull-right" } do %>
+ All <%= controller.model_class.class_for_display.pluralize.downcase %>
+ <% end %>
+ <% end %>
+ <% } %>
+ <li class="divider" />
+ <li><span class="navbar-text" id="chooser-breadcrumb">All <%= controller.model_class.class_for_display.pluralize.downcase %></span></li>
+ </ul>
+ </div>
+ <% end %>
+ <input type="text" class="form-control filterable-control" placeholder="Search" data-filterable-target=".modal.arv-choose .selectable-container"/>
</div>
- <% end %>
-
<div class="row" style="height: 20em">
- <div class="col-sm-6 container-fluid arv-filterable-list selectable-container"
- style="height: 100%; overflow-y: scroll"
- data-infinite-scroller="#choose-scroll"
- id="choose-scroll"
- data-infinite-content-href="<%= @next_page_href %>">
- <%= render partial: 'choose_rows', locals: {multiple: multiple} %>
- </div>
+ <div class="col-sm-6 container arv-filterable-list selectable-container"
+ style="height: 100%; overflow-y: scroll"
+ data-infinite-scroller="#choose-scroll"
+ id="choose-scroll"
+ data-infinite-content-href="<%= @next_page_href %>">
+ <%= render partial: 'choose_rows', locals: {multiple: multiple} %>
+ </div>
<div class="col-sm-6 modal-dialog-preview-pane" style="height: 100%; overflow-y: scroll">
</div>
</div>
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 5015fa8..876b0be 100644
--- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb
+++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
@@ -1,4 +1,3 @@
- <ul class="dropdown-menu" role="menu">
<li role="presentation" class="dropdown-header">
<%= top_button.call %>
My projects
@@ -23,4 +22,3 @@
<% end %>
</li>
<% end %>
- </ul>
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index feaa7db..2418489 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -187,16 +187,18 @@
Projects
<span class="caret"></span>
</a>
- <%= render partial: "projects_tree_menu", locals: {
- :project_link_to => Proc.new do |pnode, &block|
- link_to(project_path(pnode[:object].uuid), data: {object_uuid: pnode[:object].uuid, name: 'name'}, &block)
- end,
- :top_button => Proc.new do %>
- <% link_to projects_path, method: 'post', class: 'btn btn-xs btn-default pull-right' do %>
- <i class="fa fa-plus"></i> New project
- <% end %>
- <% end %>
- <% } %>
+ <ul class="dropdown-menu" role="menu">
+ <%= render partial: "projects_tree_menu", locals: {
+ :project_link_to => Proc.new do |pnode, &block|
+ link_to(project_path(pnode[:object].uuid), data: {object_uuid: pnode[:object].uuid, name: 'name'}, &block)
+ end,
+ :top_button => Proc.new do %>
+ <% link_to projects_path, method: 'post', class: 'btn btn-xs btn-default pull-right' do %>
+ <i class="fa fa-plus"></i> New project
+ <% end %>
+ <% end %>
+ <% } %>
+ </ul>
</li>
<% project_breadcrumbs.each do |p| %>
<li class="nav-separator">
commit 7bb16e4139068847fc138a0c0375a05819e7bd00
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Jul 21 13:20:51 2014 -0400
3235: Hide projects dropdown unless caller asked for it.
diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index a3ca815..07edb47 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -12,9 +12,11 @@
</div>
<div class="modal-body">
- <nav class="navbar navbar-default breadcrumbs" role="navigation">
- <ul class="nav navbar-nav navbar-left">
- <li class="dropdown">
+ <% if params[:by_project] %>
+ <div class="btn-group">
+ <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+ Projects <span class="caret"></span>
+ </button>
<%= render partial: "projects_tree_menu", locals: {
:project_link_to => Proc.new do |pnode, &block|
link_to "#", {"class" => "chooser-show-project", "data-project-uuid" => pnode[:object].uuid }, &block
@@ -34,7 +36,8 @@
<div class="navbar-form navbar-right">
<input type="text" class="form-control filterable-control" placeholder="Search" data-filterable-target=".modal.arv-choose .selectable-container"/>
</div>
- </nav>
+ </div>
+ <% end %>
<div class="row" style="height: 20em">
<div class="col-sm-6 container-fluid arv-filterable-list selectable-container"
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 3334912..5015fa8 100644
--- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb
+++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
@@ -1,8 +1,3 @@
- <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="projects-menu">
- <i class="fa fa-lg fa-fw fa-home"></i>
- Projects
- <span class="caret"></span>
- </a>
<ul class="dropdown-menu" role="menu">
<li role="presentation" class="dropdown-header">
<%= top_button.call %>
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 94fe580..feaa7db 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -182,6 +182,11 @@
<nav class="navbar navbar-default breadcrumbs" role="navigation">
<ul class="nav navbar-nav navbar-left">
<li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="projects-menu">
+ <i class="fa fa-lg fa-fw fa-home"></i>
+ Projects
+ <span class="caret"></span>
+ </a>
<%= render partial: "projects_tree_menu", locals: {
:project_link_to => Proc.new do |pnode, &block|
link_to(project_path(pnode[:object].uuid), data: {object_uuid: pnode[:object].uuid, name: 'name'}, &block)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list