X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/555c1e920855989e059a4be0503ebb627193f987..62790d76daf181a457d8f47741721967cd9cb7d9:/apps/workbench/app/controllers/projects_controller.rb diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb index 573e387f08..435e0cd5d6 100644 --- a/apps/workbench/app/controllers/projects_controller.rb +++ b/apps/workbench/app/controllers/projects_controller.rb @@ -1,4 +1,6 @@ class ProjectsController < ApplicationController + before_filter :set_share_links, if: -> { defined? @object } + def model_class Group end @@ -28,6 +30,19 @@ class ProjectsController < ApplicationController end end + def set_share_links + @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 + end + def index_pane_list %w(Projects) end @@ -57,12 +72,30 @@ class ProjectsController < ApplicationController :filters => [%w(uuid is_a) + [%w(arvados#human arvados#specimen arvados#trait)]] } ] - # Note that adding :filters to 'Sharing' won't help show the count for it because @user_is_manager is only set in #show - # Therefore if a count were desired there we'd want to set @user_is_manager in a before_filter or somesuch. - pane_list << { :name => 'Sharing' } if @user_is_manager + pane_list << { :name => 'Sharing', + :count => @share_links.count } if @user_is_manager pane_list << { :name => 'Advanced' } end + # Called via AJAX and returns Javascript that populates tab counts into tab titles. + # References #show_pane_list action which should return an array of hashes each with :name + # and then optionally a :filters to run or a straight up :count + # + # This action could easily be moved to the ApplicationController to genericize the tab_counts behaviour, + # but one or more new routes would have to be created, the js.erb would also have to be moved + def tab_counts + @tab_counts = {} + show_pane_list.each do |pane| + if pane.is_a?(Hash) + if pane[:count] + @tab_counts[pane[:name]] = pane[:count] + elsif pane[:filters] + @tab_counts[pane[:name]] = @object.contents(filters: pane[:filters]).items_available + end + end + end + end + def remove_item params[:item_uuids] = [params[:item_uuid]] remove_items @@ -94,8 +127,23 @@ class ProjectsController < ApplicationController if item.owner_uuid == @object.uuid # Object is owned by this project. Remove it from the project by # changing owner to the current user. - item.update_attributes owner_uuid: current_user.uuid - @removed_uuids << item.uuid + begin + item.update_attributes owner_uuid: current_user.uuid + @removed_uuids << item.uuid + rescue ArvadosApiClient::ApiErrorResponseException => e + if e.message.include? 'collection_owner_uuid_name_unique' + rename_to = item.name + ' removed from ' + + (@object.name ? @object.name : @object.uuid) + + ' at ' + Time.now.to_s + updates = {} + updates[:name] = rename_to + updates[:owner_uuid] = current_user.uuid + item.update_attributes updates + @removed_uuids << item.uuid + else + raise + end + end end end end @@ -183,17 +231,6 @@ class ProjectsController < ApplicationController return render_not_found("object not found") end - @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 - if params[:partial] load_contents_objects respond_to do |f|