[ARVADOS] updated: 1076b57c3d701df3ceaa4d54973ccc533729f097
git at public.curoverse.com
git at public.curoverse.com
Fri Aug 8 10:26:50 EDT 2014
Summary of changes:
.../app/controllers/projects_controller.rb | 16 +++++++-----
apps/workbench/app/views/layouts/body.html.erb | 22 ++++++++--------
.../app/views/projects/_index_projects.html.erb | 8 +++---
.../views/projects/_show_data_collections.html.erb | 30 ++++++++++++----------
apps/workbench/app/views/projects/index.html.erb | 7 +----
5 files changed, 43 insertions(+), 40 deletions(-)
via 1076b57c3d701df3ceaa4d54973ccc533729f097 (commit)
via 2d96a5bd256fc82dc274333ddaa4395016037170 (commit)
via b75aa879bc2035b5ac07ec3c389b4898194a03d7 (commit)
via 299396a4e79e5e5f6e5519898f563cd19bac6431 (commit)
from b2800c21fc219f26066d531b2082dac0d377e7f4 (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 1076b57c3d701df3ceaa4d54973ccc533729f097
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Aug 8 10:26:33 2014 -0400
3499: Do not show Home in breadcrumbs when viewing dashboard page.
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index ef9ed08..a8c4584 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -166,21 +166,23 @@
<% } %>
</ul>
</li>
- <li class="nav-separator">
- <i class="fa fa-lg fa-angle-double-right"></i>
- </li>
- <li>
- <%= link_to project_path(current_user.uuid) do %>
- Home
- <% end %>
- </li>
- <% project_breadcrumbs.each do |p| %>
+ <% if @name_link or @object %>
<li class="nav-separator">
<i class="fa fa-lg fa-angle-double-right"></i>
</li>
<li>
- <%= link_to(p.name, project_path(p.uuid), data: {object_uuid: p.uuid, name: 'name'}) %>
+ <%= link_to project_path(current_user.uuid) do %>
+ Home
+ <% end %>
</li>
+ <% project_breadcrumbs.each do |p| %>
+ <li class="nav-separator">
+ <i class="fa fa-lg fa-angle-double-right"></i>
+ </li>
+ <li>
+ <%= link_to(p.name, project_path(p.uuid), data: {object_uuid: p.uuid, name: 'name'}) %>
+ </li>
+ <% end %>
<% end %>
</ul>
</nav>
diff --git a/apps/workbench/app/views/projects/index.html.erb b/apps/workbench/app/views/projects/index.html.erb
index 9b3a0a0..219bad2 100644
--- a/apps/workbench/app/views/projects/index.html.erb
+++ b/apps/workbench/app/views/projects/index.html.erb
@@ -1,8 +1,3 @@
-<% content_for :breadcrumbs do %>
-<li class="nav-separator"><span class="glyphicon glyphicon-arrow-right"></span></li>
-<li><a href="#">Home</a></li>
-<% end %>
-
<div>
<div class="row">
<div class="col-sm-6">
commit 2d96a5bd256fc82dc274333ddaa4395016037170
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Aug 8 09:41:17 2014 -0400
3499: Do not show "Sharing" tab on Home project.
diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index bf1bc93..9f4c588 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -143,13 +143,15 @@ class ProjectsController < ApplicationController
@groups = Group.limit(10000).
select(["uuid", "name", "description"])
- begin
- @share_links = Link.permissions_for(@object)
- @user_is_manager = true
- rescue ArvadosApiClient::AccessForbiddenException,
- ArvadosApiClient::NotFoundException
- @share_links = []
- @user_is_manager = false
+ @user_is_manager = false
+ @share_links = []
+ if @object.uuid != current_user.uuid
+ begin
+ @share_links = Link.permissions_for(@object)
+ @user_is_manager = true
+ rescue ArvadosApiClient::AccessForbiddenException,
+ ArvadosApiClient::NotFoundException
+ end
end
@objects_and_names = get_objects_and_names @objects
commit b75aa879bc2035b5ac07ec3c389b4898194a03d7
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Aug 8 09:38:31 2014 -0400
3499: Show "Home" in "My projects" panel on dashboard.
diff --git a/apps/workbench/app/views/projects/_index_projects.html.erb b/apps/workbench/app/views/projects/_index_projects.html.erb
index b05a87d..027dc29 100644
--- a/apps/workbench/app/views/projects/_index_projects.html.erb
+++ b/apps/workbench/app/views/projects/_index_projects.html.erb
@@ -9,8 +9,10 @@
<%= projectnode[:object] %>
<% elsif show_root_node and rowtype == User %>
<% if projectnode[:object].uuid == current_user.andand.uuid %>
- <i class="fa fa-fw fa-folder-open-o"></i>
- My Projects
+ <i class="fa fa-fw fa-folder-o"></i>
+ <%= link_to project_path(id: projectnode[:object].uuid) do %>
+ Home
+ <% end %>
<% else %>
<i class="fa fa-fw fa-folder-o"></i>
<%= projectnode[:object].friendly_link_name %>
@@ -22,7 +24,7 @@
<% end %>
<% end %>
</div>
- <% if not projectnode[:object].description.blank? %>
+ <% if projectnode[:object].respond_to?(:description) and not projectnode[:object].description.blank? %>
<div class="col-md-8 small"><%= projectnode[:object].description %></div>
<% end %>
</div>
diff --git a/apps/workbench/app/views/projects/index.html.erb b/apps/workbench/app/views/projects/index.html.erb
index 2c76433..9b3a0a0 100644
--- a/apps/workbench/app/views/projects/index.html.erb
+++ b/apps/workbench/app/views/projects/index.html.erb
@@ -37,7 +37,7 @@
</h3>
</div>
<div class="panel-body scroll-20em">
- <%= render partial: 'index_projects', locals: {tree: my_project_tree, show_root_node: false} %>
+ <%= render partial: 'index_projects', locals: {tree: my_project_tree, show_root_node: true} %>
</div>
</div>
</div>
commit 299396a4e79e5e5f6e5519898f563cd19bac6431
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Aug 8 09:31:11 2014 -0400
3499: Do not show "Move" and "Delete" buttons on Home project.
diff --git a/apps/workbench/app/views/projects/_show_data_collections.html.erb b/apps/workbench/app/views/projects/_show_data_collections.html.erb
index 3c8607e..337629a 100644
--- a/apps/workbench/app/views/projects/_show_data_collections.html.erb
+++ b/apps/workbench/app/views/projects/_show_data_collections.html.erb
@@ -39,20 +39,22 @@
<i class="fa fa-fw fa-plus"></i>
Add a subproject
<% end %>
- <%= link_to(
- choose_projects_path(
- title: 'Move this project to...',
- editable: true,
- my_root_selectable: true,
- action_name: 'Move',
- action_href: project_path(@object.uuid),
- action_method: 'put',
- action_data: {selection_param: 'project[owner_uuid]', success: 'page-refresh'}.to_json),
- { class: "btn btn-sm btn-primary arv-move-to-project", remote: true, method: 'get' }) do %>
- <i class="fa fa-fw fa-truck"></i> Move project...
- <% end %>
- <%= link_to(project_path(id: @object.uuid), method: 'delete', class: 'btn btn-sm btn-primary', data: {confirm: "Really delete project '#{@object.name}'?"}) do %>
- <i class="fa fa-fw fa-trash-o"></i> Delete project
+ <% if @object.uuid != current_user.uuid # Not the "Home" project %>
+ <%= link_to(
+ choose_projects_path(
+ title: 'Move this project to...',
+ editable: true,
+ my_root_selectable: true,
+ action_name: 'Move',
+ action_href: project_path(@object.uuid),
+ action_method: 'put',
+ action_data: {selection_param: 'project[owner_uuid]', success: 'page-refresh'}.to_json),
+ { class: "btn btn-sm btn-primary arv-move-to-project", remote: true, method: 'get' }) do %>
+ <i class="fa fa-fw fa-truck"></i> Move project...
+ <% end %>
+ <%= link_to(project_path(id: @object.uuid), method: 'delete', class: 'btn btn-sm btn-primary', data: {confirm: "Really delete project '#{@object.name}'?"}) do %>
+ <i class="fa fa-fw fa-trash-o"></i> Delete project
+ <% end %>
<% end %>
<% end %>
<% end %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list