From 4177bcc9b935391630c874a2abcedb81efa350f0 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 25 Mar 2014 16:08:10 -0400 Subject: [PATCH] Removed head_kind and tail_kind from workbench. Removed some trailing whitespace. --- .../app/assets/javascripts/application.js | 3 +-- .../app/controllers/actions_controller.rb | 2 -- .../app/controllers/collections_controller.rb | 14 +++++++------- apps/workbench/app/controllers/users_controller.rb | 3 --- apps/workbench/app/models/arvados_base.rb | 6 +----- apps/workbench/app/models/link.rb | 2 +- 6 files changed, 10 insertions(+), 20 deletions(-) diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js index e7884b9516..b49ffe4af1 100644 --- a/apps/workbench/app/assets/javascripts/application.js +++ b/apps/workbench/app/assets/javascripts/application.js @@ -89,7 +89,6 @@ jQuery(function($){ {dataType: 'json', type: $(this).attr('data-remote-method'), data: { - 'link[head_kind]': 'arvados#collection', 'link[head_uuid]': tag_head_uuid, 'link[link_class]': 'tag', 'link[name]': new_tag @@ -129,7 +128,7 @@ jQuery(function($){ }); } } - + var fixer = new HeaderRowFixer('.table-fixed-header-row'); fixer.duplicateTheadTr(); fixer.fixThead(); diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb index 74e5831235..8a817f03cd 100644 --- a/apps/workbench/app/controllers/actions_controller.rb +++ b/apps/workbench/app/controllers/actions_controller.rb @@ -76,9 +76,7 @@ class ActionsController < ApplicationController chash.each do |k,v| l = Link.new({ - tail_kind: "arvados#collection", tail_uuid: k, - head_kind: "arvados#collection", head_uuid: newuuid, link_class: "provenance", name: "provided" diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb index 01abbb4ee0..f24a77ad1f 100644 --- a/apps/workbench/app/controllers/collections_controller.rb +++ b/apps/workbench/app/controllers/collections_controller.rb @@ -104,7 +104,7 @@ class CollectionsController < ApplicationController Link.where(tail_uuid: @sourcedata.keys).each do |link| if link.link_class == 'data_origin' @sourcedata[link.tail_uuid][:data_origins] ||= [] - @sourcedata[link.tail_uuid][:data_origins] << [link.name, link.head_kind, link.head_uuid] + @sourcedata[link.tail_uuid][:data_origins] << [link.name, link.head_uuid] end end Collection.where(uuid: @sourcedata.keys).each do |collection| @@ -112,17 +112,17 @@ class CollectionsController < ApplicationController @sourcedata[collection.uuid][:collection] = collection end end - + Collection.where(uuid: @object.uuid).each do |u| puts request - @prov_svg = ProvenanceHelper::create_provenance_graph(u.provenance, "provenance_svg", + @prov_svg = ProvenanceHelper::create_provenance_graph(u.provenance, "provenance_svg", {:request => request, - :direction => :bottom_up, + :direction => :bottom_up, :combine_jobs => :script_only}) rescue nil - @used_by_svg = ProvenanceHelper::create_provenance_graph(u.used_by, "used_by_svg", + @used_by_svg = ProvenanceHelper::create_provenance_graph(u.used_by, "used_by_svg", {:request => request, - :direction => :top_down, - :combine_jobs => :script_only, + :direction => :top_down, + :combine_jobs => :script_only, :pdata_only => true}) rescue nil end end diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb index c33de2d034..02f1d83cdc 100644 --- a/apps/workbench/app/controllers/users_controller.rb +++ b/apps/workbench/app/controllers/users_controller.rb @@ -30,9 +30,6 @@ class UsersController < ApplicationController def home @showallalerts = false @my_ssh_keys = AuthorizedKey.where(authorized_user_uuid: current_user.uuid) - # @my_vm_perms = Link.where(tail_uuid: current_user.uuid, head_kind: 'arvados#virtual_machine', link_class: 'permission', name: 'can_login') - # @my_repo_perms = Link.where(tail_uuid: current_user.uuid, head_kind: 'arvados#repository', link_class: 'permission', name: 'can_write') - @my_tag_links = {} @my_jobs = Job. diff --git a/apps/workbench/app/models/arvados_base.rb b/apps/workbench/app/models/arvados_base.rb index 43f40d9f96..15ba1e5f5a 100644 --- a/apps/workbench/app/models/arvados_base.rb +++ b/apps/workbench/app/models/arvados_base.rb @@ -32,9 +32,7 @@ class ArvadosBase < ActiveRecord::Base 'modified_by_user_uuid' => '004', 'modified_by_client_uuid' => '005', 'name' => '050', - 'tail_kind' => '100', 'tail_uuid' => '100', - 'head_kind' => '101', 'head_uuid' => '101', 'info' => 'zzz-000', 'updated_at' => 'zzz-999' @@ -160,14 +158,12 @@ class ArvadosBase < ActiveRecord::Base true end end - + def links(*args) o = {} o.merge!(args.pop) if args[-1].is_a? Hash o[:link_class] ||= args.shift o[:name] ||= args.shift - o[:head_kind] ||= args.shift - o[:tail_kind] = self.kind o[:tail_uuid] = self.uuid if all_links return all_links.select do |m| diff --git a/apps/workbench/app/models/link.rb b/apps/workbench/app/models/link.rb index 899a80022c..5e7b42a60b 100644 --- a/apps/workbench/app/models/link.rb +++ b/apps/workbench/app/models/link.rb @@ -2,6 +2,6 @@ class Link < ArvadosBase attr_accessor :head attr_accessor :tail def self.by_tail(t, opts={}) - where(opts.merge :tail_kind => t.kind, :tail_uuid => t.uuid) + where(opts.merge :tail_uuid => t.uuid) end end -- 2.30.2