[ARVADOS] updated: d5835c0402a581b1b4379c71f711a6fdf86fdab5
git at public.curoverse.com
git at public.curoverse.com
Tue Aug 26 11:14:15 EDT 2014
Summary of changes:
.../workbench/app/assets/javascripts/filterable.js | 43 +++++++++++--
.../app/assets/javascripts/infinite_scroll.js | 70 +++++++++++++++++++---
.../app/assets/javascripts/select_modal.js | 10 ++--
.../app/controllers/actions_controller.rb | 11 +++-
.../app/controllers/application_controller.rb | 3 +-
.../app/views/application/_choose.html.erb | 23 ++++---
.../app/views/projects/_show_tab_contents.html.erb | 2 +-
.../test/integration/pipeline_instances_test.rb | 8 ++-
services/api/app/models/job.rb | 2 -
services/api/app/models/pipeline_instance.rb | 1 -
.../20140817035914_add_unique_name_constraints.rb | 2 +-
11 files changed, 135 insertions(+), 40 deletions(-)
via d5835c0402a581b1b4379c71f711a6fdf86fdab5 (commit)
via e21b910a307440a9d34e595673539a6e7d708e55 (commit)
via f12350f25275fbf4c6c8692122f5eacce89794ee (commit)
via d1d0fd3c4e60298ce3cf6a718820a8f49abf1ded (commit)
via 80f6898bdc0006b95a398d2a8fe0dc8e99c87fb0 (commit)
via 8dcb4daaa7e740f5957043321ccf2c1a7bd2ccb6 (commit)
via 1a1abfc1b6c1fbb97539cb503a81dfd678adcdf1 (commit)
via b04f78ea89893d11eee642ad1578862610643d16 (commit)
via d12257e98b7d965d6e34cdede8b90961e25489e3 (commit)
via c5f356f041ce97a9c506f0ed276c80e9de24b436 (commit)
via cce04610bca932fcd6dec3d54ef349bd877d5c2e (commit)
via 846abbca5bd9f8ed511f2960d875a228a76a6589 (commit)
via c337182505d76ee11d476d7c79b09305182cba29 (commit)
from 61cd57499905e8e8cca07c774d1bf8c6bfa069a7 (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 d5835c0402a581b1b4379c71f711a6fdf86fdab5
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Aug 26 11:14:07 2014 -0400
Fix migration and api templates that rely on changes that did not end up happening. refs #3036
diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index f56b57a..6ec42a1 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -40,8 +40,6 @@ class Job < ArvadosModel
t.add :repository
t.add :supplied_script_version
t.add :docker_image_locator
- t.add :name
- t.add :description
end
def assert_finished
diff --git a/services/api/app/models/pipeline_instance.rb b/services/api/app/models/pipeline_instance.rb
index f2c930c..354c892 100644
--- a/services/api/app/models/pipeline_instance.rb
+++ b/services/api/app/models/pipeline_instance.rb
@@ -17,7 +17,6 @@ class PipelineInstance < ArvadosModel
t.add :pipeline_template_uuid
t.add :pipeline_template, :if => :pipeline_template
t.add :name
- t.add :description
t.add :components
t.add :dependencies
t.add :properties
diff --git a/services/api/db/migrate/20140817035914_add_unique_name_constraints.rb b/services/api/db/migrate/20140817035914_add_unique_name_constraints.rb
index 3b7eecc..3c57e6f 100644
--- a/services/api/db/migrate/20140817035914_add_unique_name_constraints.rb
+++ b/services/api/db/migrate/20140817035914_add_unique_name_constraints.rb
@@ -1,7 +1,7 @@
class AddUniqueNameConstraints < ActiveRecord::Migration
def change
# Ensure uniqueness before adding constraints.
- ["collections", "pipeline_templates", "pipeline_instances", "jobs", "groups"].each do |table|
+ ["collections", "pipeline_templates", "groups"].each do |table|
rows = ActiveRecord::Base.connection.select_all %{
select uuid, owner_uuid, name from #{table} order by owner_uuid, name
}
commit e21b910a307440a9d34e595673539a6e7d708e55
Merge: d1d0fd3 f12350f
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Aug 26 11:00:53 2014 -0400
Merge branch '3149-server-side-search' closes #3149
commit f12350f25275fbf4c6c8692122f5eacce89794ee
Merge: 80f6898 d1d0fd3
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Aug 26 11:00:16 2014 -0400
3149: Merge branch 'master' into 3149-server-side-search
commit d1d0fd3c4e60298ce3cf6a718820a8f49abf1ded
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Aug 26 09:49:37 2014 -0400
Set up arvados env vars when running arv-normalize. No issue #
diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 7005ef9..377f930 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -89,7 +89,16 @@ class ActionsController < ApplicationController
def arv_normalize mt, *opts
r = ""
- IO.popen(['arv-normalize'] + opts, 'w+b') do |io|
+ env = Hash[ENV].
+ merge({'ARVADOS_API_HOST' =>
+ arvados_api_client.arvados_v1_base.
+ sub(/\/arvados\/v1/, '').
+ sub(/^https?:\/\//, ''),
+ 'ARVADOS_API_TOKEN' => 'x',
+ 'ARVADOS_API_HOST_INSECURE' =>
+ Rails.configuration.arvados_insecure_https ? 'true' : 'false'
+ })
+ IO.popen([env, 'arv-normalize'] + opts, 'w+b') do |io|
io.write mt
io.close_write
while buf = io.read(2**16)
commit 80f6898bdc0006b95a398d2a8fe0dc8e99c87fb0
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Aug 25 22:29:11 2014 -0400
3149: Clarify comments. Stick with a-b-c data keys where possible;
when not possible, explain why not.
diff --git a/apps/workbench/app/assets/javascripts/filterable.js b/apps/workbench/app/assets/javascripts/filterable.js
index 51a1060..d14551c 100644
--- a/apps/workbench/app/assets/javascripts/filterable.js
+++ b/apps/workbench/app/assets/javascripts/filterable.js
@@ -24,9 +24,9 @@ $(document).
// characters in the search box), hide the stale
// content and ask the server for new results.
var newquery = $target.data('filterable-query-new');
- var params = $target.data('infiniteContentParamsFilterable') || {};
+ var params = $target.data('infinite-content-params-filterable') || {};
params.filters = [['any', 'ilike', '%' + newquery + '%']];
- $target.data('infiniteContentParamsFilterable', params);
+ $target.data('infinite-content-params-filterable', params);
$target.data('filterable-query', newquery);
$target.trigger('refresh-content');
}, 250));
diff --git a/apps/workbench/app/assets/javascripts/infinite_scroll.js b/apps/workbench/app/assets/javascripts/infinite_scroll.js
index 74c1286..6b392c4 100644
--- a/apps/workbench/app/assets/javascripts/infinite_scroll.js
+++ b/apps/workbench/app/assets/javascripts/infinite_scroll.js
@@ -41,11 +41,26 @@ function maybe_load_more_content(event) {
$container.append(spinner);
$container.attr('data-infinite-serial', serial);
- // Combine infiniteContentParams from multiple
- // sources. filterable.js might put its params in
- // infiniteContentParamsFilterable, etc.
+ // Combine infiniteContentParams from multiple sources. This
+ // mechanism allows each of several components to set and
+ // update its own set of filters, without having to worry
+ // about stomping on some other component's filters.
+ //
+ // For example, filterable.js writes filters in
+ // infiniteContentParamsFilterable ("search for text foo")
+ // without worrying about clobbering the filters set up by the
+ // tab pane ("only show jobs and pipelines in this tab").
params = {};
$.each($container.data(), function(datakey, datavalue) {
+ // Note: We attach these data to DOM elements using
+ // <element data-foo-bar="baz">. We store/retrieve them
+ // using $('element').data('foo-bar'), although
+ // .data('fooBar') would also work. The "all data" hash
+ // returned by $('element').data(), however, always has
+ // keys like 'fooBar'. In other words, where we have a
+ // choice, we stick with the 'foo-bar' style to be
+ // consistent with HTML. Here, our only option is
+ // 'fooBar'.
if (/^infiniteContentParams/.exec(datakey)) {
if (datavalue instanceof Object) {
$.each(datavalue, function(hkey, hvalue) {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list