X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/964ab3dd90ff1508efc0c77378cde2b3a4da1029..b3e2782f72e0ca381f3f8c508227ebd7a2ef0c92:/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 600af8d60b..c4600f2c0f 100644 --- a/apps/workbench/app/controllers/projects_controller.rb +++ b/apps/workbench/app/controllers/projects_controller.rb @@ -1,5 +1,9 @@ class ProjectsController < ApplicationController - before_filter :set_share_links, if: -> { defined? @object } + before_filter :set_share_links, if: -> { defined? @object and @object} + skip_around_filter :require_thread_api_token, if: proc { |ctrl| + Rails.configuration.anonymous_user_token and + %w(show tab_counts public).include? ctrl.action_name + } def model_class Group @@ -30,19 +34,6 @@ 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 @@ -51,27 +42,35 @@ class ProjectsController < ApplicationController # us to tell the interface to get counts for each pane (using :filters). # It also seems to me that something like these could be used to configure the contents of the panes. def show_pane_list - pane_list = [ + pane_list = [] + if @object.uuid != current_user.andand.uuid + pane_list << 'Description' + end + pane_list << { :name => 'Data_collections', :filters => [%w(uuid is_a arvados#collection)] - }, + } + pane_list << { :name => 'Jobs_and_pipelines', :filters => [%w(uuid is_a) + [%w(arvados#job arvados#pipelineInstance)]] - }, + } + pane_list << { :name => 'Pipeline_templates', :filters => [%w(uuid is_a arvados#pipelineTemplate)] - }, + } + pane_list << { :name => 'Subprojects', :filters => [%w(uuid is_a arvados#group)] - }, - { :name => 'Other_objects', - :filters => [%w(uuid is_a) + [%w(arvados#human arvados#specimen arvados#trait)]] } - ] + pane_list << + { + :name => 'Other_objects', + :filters => [%w(uuid is_a) + [%w(arvados#human arvados#specimen arvados#trait)]] + } if current_user pane_list << { :name => 'Sharing', :count => @share_links.count } if @user_is_manager pane_list << { :name => 'Advanced' } @@ -124,14 +123,20 @@ class ProjectsController < ApplicationController @removed_uuids << link.uuid link.destroy end - if item.owner_uuid == @object.uuid + + # If this object has the 'expires_at' attribute, then simply mark it + # expired. + if item.attributes.include?("expires_at") + item.update_attributes expires_at: Time.now + @removed_uuids << item.uuid + elsif item.owner_uuid == @object.uuid # Object is owned by this project. Remove it from the project by # changing owner to the current user. 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' + if e.message.include? '_owner_uuid_name_unique' rename_to = item.name + ' removed from ' + (@object.name ? @object.name : @object.uuid) + ' at ' + Time.now.to_s @@ -155,7 +160,7 @@ class ProjectsController < ApplicationController object.destroy end end - while (objects = @object.contents(include_linked: false)).any? + while (objects = @object.contents).any? objects.each do |object| object.update_attributes! owner_uuid: current_user.uuid end @@ -196,7 +201,6 @@ class ProjectsController < ApplicationController (val.is_a?(Array) ? val : [val]).each do |type| objects = @object.contents(order: @order, limit: @limit, - include_linked: true, filters: (@filters - kind_filters + [['uuid', 'is_a', type]]), ) objects.each do |object| @@ -234,7 +238,6 @@ class ProjectsController < ApplicationController else @objects = @object.contents(order: @order, limit: @limit, - include_linked: true, filters: @filters, offset: @offset) @next_page_href = next_page_href(partial: :contents_rows, @@ -305,36 +308,10 @@ class ProjectsController < ApplicationController objects_and_names end - def share_with - if not params[:uuids].andand.any? - @errors = ["No user/group UUIDs specified to share with."] - return render_error(status: 422) - end - results = {"success" => [], "errors" => []} - params[:uuids].each do |shared_uuid| - begin - Link.create(tail_uuid: shared_uuid, link_class: "permission", - name: "can_read", head_uuid: @object.uuid) - rescue ArvadosApiClient::ApiError => error - error_list = error.api_response.andand[:errors] - if error_list.andand.any? - results["errors"] += error_list.map { |e| "#{shared_uuid}: #{e}" } - else - error_code = error.api_status || "Bad status" - results["errors"] << "#{shared_uuid}: #{error_code} response" - end - else - results["success"] << shared_uuid - end - end - if results["errors"].empty? - results.delete("errors") - status = 200 - else - status = 422 - end - respond_to do |f| - f.json { render(json: results, status: status) } + def public # Yes 'public' is the name of the action for public projects + return render_not_found if not Rails.configuration.anonymous_user_token + @objects = using_specific_api_token Rails.configuration.anonymous_user_token do + Group.where(group_class: 'project').order("updated_at DESC") end end end