[ARVADOS] updated: e96a00962a6f5fcf65529630e4f2850fbfde2b73
git at public.curoverse.com
git at public.curoverse.com
Sat May 24 17:10:20 EDT 2014
Summary of changes:
apps/workbench/app/assets/javascripts/editable.js | 4 +
.../app/assets/javascripts/pipeline_instances.js | 119 +++----
apps/workbench/app/assets/javascripts/selection.js | 2 +-
.../controllers/pipeline_instances_controller.rb | 6 +-
apps/workbench/app/helpers/application_helper.rb | 4 +-
.../pipeline_instances/_show_components.html.erb | 8 +-
.../_show_components_editable.html.erb | 2 +-
.../views/pipeline_instances/_show_inputs.html.erb | 50 +++
.../views/pipeline_templates/_show_recent.html.erb | 39 +--
.../test/integration/pipeline_instances_test.rb | 56 +++
apps/workbench/test/integration/smoke_test.rb | 4 +
apps/workbench/test/integration_helper.rb | 16 +
sdk/go/build.sh | 37 --
sdk/go/go.sh | 17 +
sdk/go/src/arvados.org/keepclient/keepclient.go | 45 ++-
.../src/arvados.org/keepclient/keepclient_test.go | 94 ++---
sdk/go/src/arvados.org/keepclient/support.go | 41 +--
services/api/test/fixtures/collections.yml | 8 +-
services/api/test/fixtures/pipeline_templates.yml | 4 +-
services/keep/build.sh | 36 --
services/keep/go.sh | 17 +
.../keep/src/arvados.org/keepproxy/keepproxy.go | 379 +++++++++++++++++++++
.../src/arvados.org/keepproxy/keepproxy_test.go | 205 +++++++++++
23 files changed, 964 insertions(+), 229 deletions(-)
create mode 100644 apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb
create mode 100644 apps/workbench/test/integration/pipeline_instances_test.rb
delete mode 100755 sdk/go/build.sh
create mode 100755 sdk/go/go.sh
delete mode 100755 services/keep/build.sh
create mode 100755 services/keep/go.sh
create mode 100644 services/keep/src/arvados.org/keepproxy/keepproxy.go
create mode 100644 services/keep/src/arvados.org/keepproxy/keepproxy_test.go
via e96a00962a6f5fcf65529630e4f2850fbfde2b73 (commit)
via f36fe36bd5e64b55b8699fae187c6accb678db2b (commit)
via 293b52241445edf9eb86e0a0f9b63fccc3aa7fbd (commit)
via b06affa05ffbb121512ae179feb06c0bf90541bd (commit)
via 8570c81e79a9c00a314e2cf28a008b9aeae65037 (commit)
via 8815915612d1d8fef2001083bec2a24b3ed2eb3f (commit)
via 7331dca3c9f4a75e291b9b975f7cd570ad2b3f96 (commit)
via b668cb88f24085f92858b268120650c28d3a79af (commit)
via ec4e4a338f45ce39b4081f67c2b991c15fdf0fcd (commit)
via 14eddaec927be590682e226b9998c3e616c0b72e (commit)
via 216733543e5348ef8ef25ee5edbe6ed2dd35f5d3 (commit)
via 34ab7b208c7eb14ccae1e31831286acf9ea29487 (commit)
via 45d037864f655373dacd681d753ea3270f4ba997 (commit)
via 744ca00ccd1e7fda9d4210b18c1f4a734f3b2261 (commit)
via b28565c8aa08cbf70762fa69e49c5067fcb57e96 (commit)
via 140944b37fac0f631e8366222b2cbc5d5373ba8a (commit)
via e35cb0f48bbead47ad0c628c280bfc2cc32035ac (commit)
via d61f27791aa739dfc93c2f953236fffd4f0fcf6c (commit)
via 89096c06922b406f7157082de410e40960f5c73e (commit)
via 9d6ce80869e187a7c5a574ea5a5272bb89dd81ce (commit)
via e2dc7f5b9068e23822391bd3cf987b6f14e83ec0 (commit)
via 1797ee0dea063ff59361740ee512c84d086dacaf (commit)
via cd85fc2c07a0e9d8c34b81e4523ee3d1ebd696e9 (commit)
via 48ffdd5ac196771381c8dc9ab47cfad5f1929720 (commit)
from 8e5db2221d848c35e751b932da8126b559d292f0 (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 e96a00962a6f5fcf65529630e4f2850fbfde2b73
Author: radhika <radhika at curoverse.com>
Date: Sat May 24 17:08:06 2014 -0400
2756: fix issue from merge conflict
diff --git a/apps/workbench/app/assets/javascripts/pipeline_instances.js b/apps/workbench/app/assets/javascripts/pipeline_instances.js
index 733105d..d23ced7 100644
--- a/apps/workbench/app/assets/javascripts/pipeline_instances.js
+++ b/apps/workbench/app/assets/javascripts/pipeline_instances.js
@@ -38,37 +38,37 @@ $(document).on('ready ajax:complete', function() {
if ($tag.hasClass("editable-empty")) {
$tag.parent().css("background-color", "#ffdddd");
$tag.parent().prev().css("background-color", "#ffdddd");
+ }
else {
$tag.parent().css("background-color", "");
$tag.parent().prev().css("background-color", "");
}
- run_pipeline_button_state();
- } );
-
- $(document).on('ajax:complete ready', function() {
- var a = $('.arv-log-event-listener');
- if (a.length > 0) {
- $('.arv-log-event-listener').each(function() {
- subscribeToEventLog(this.id);
- });
- }
});
+ run_pipeline_button_state();
+});
- $(document).on('arv-log-event', '.arv-log-event-handler-append-logs', function(event, eventData){
- parsedData = JSON.parse(eventData);
+$(document).on('ajax:complete ready', function() {
+ var a = $('.arv-log-event-listener');
+ if (a.length > 0) {
+ $('.arv-log-event-listener').each(function() {
+ subscribeToEventLog(this.id);
+ });
+ }
+});
- propertyText = undefined
+$(document).on('arv-log-event', '.arv-log-event-handler-append-logs', function(event, eventData){
+ parsedData = JSON.parse(eventData);
- properties = parsedData.properties;
- if (properties !== null) {
- propertyText = properties.text;
- }
+ propertyText = undefined
- if (propertyText !== undefined) {
- $(this).append(propertyText + "<br/>");
- } else {
- $(this).append(parsedData.summary + "<br/>");
- }
- });
+ properties = parsedData.properties;
+ if (properties !== null) {
+ propertyText = properties.text;
+ }
-})();
+ if (propertyText !== undefined) {
+ $(this).append(propertyText + "<br/>");
+ } else {
+ $(this).append(parsedData.summary + "<br/>");
+ }
+});
commit f36fe36bd5e64b55b8699fae187c6accb678db2b
Merge: 8e5db22 293b522
Author: radhika <radhika at curoverse.com>
Date: Sat May 24 15:49:06 2014 -0400
Merge branch 'master' into 2756-eventbus-in-workbench
Conflicts:
apps/workbench/app/assets/javascripts/pipeline_instances.js
diff --cc apps/workbench/app/assets/javascripts/pipeline_instances.js
index 0d83f3b,26a0c3e..733105d
--- a/apps/workbench/app/assets/javascripts/pipeline_instances.js
+++ b/apps/workbench/app/assets/javascripts/pipeline_instances.js
@@@ -1,71 -1,48 +1,74 @@@
- (function() {
- var run_pipeline_button_state = function() {
- var a = $('a.editable.required.editable-empty');
- if (a.length > 0) {
- $("#run-pipeline-button").addClass("disabled");
+ function run_pipeline_button_state() {
+ var a = $('a.editable.required.editable-empty');
+ if (a.length > 0) {
+ $(".run-pipeline-button").addClass("disabled");
+ }
+ else {
+ $(".run-pipeline-button").removeClass("disabled");
+ }
+ }
+
+ $(document).on('editable:success', function(event, tag, response, newValue) {
+ var $tag = $(tag);
+ if ($('.run-pipeline-button').length == 0)
+ return;
+ if ($tag.hasClass("required")) {
+ if (newValue && newValue.trim() != "") {
+ $tag.removeClass("editable-empty");
+ $tag.parent().css("background-color", "");
+ $tag.parent().prev().css("background-color", "");
}
else {
- $("#run-pipeline-button").removeClass("disabled");
+ $tag.addClass("editable-empty");
+ $tag.parent().css("background-color", "#ffdddd");
+ $tag.parent().prev().css("background-color", "#ffdddd");
}
}
-
- $.fn.editable.defaults.success = function (response, newValue) {
- var tag = $(this);
- if (tag.hasClass("required")) {
- if (newValue && newValue.trim() != "") {
- tag.removeClass("editable-empty");
- tag.parent().css("background-color", "");
- tag.parent().prev().css("background-color", "");
- }
- else {
- tag.addClass("editable-empty");
- tag.parent().css("background-color", "#ffdddd");
- tag.parent().prev().css("background-color", "#ffdddd");
- }
- }
- run_pipeline_button_state();
+ if ($tag.attr('data-name')) {
+ // Update other inputs representing the same piece of data
+ $('.editable[data-name="' + $tag.attr('data-name') + '"]').
+ editable('setValue', newValue);
}
+ run_pipeline_button_state();
+ });
- $(window).on('load', function() {
- var a = $('a.editable.required');
- for (var i = 0; i < a.length; i++) {
- var tag = $(a[i]);
- if (tag.hasClass("editable-empty")) {
- tag.parent().css("background-color", "#ffdddd");
- tag.parent().prev().css("background-color", "#ffdddd");
- }
- else {
- tag.parent().css("background-color", "");
- tag.parent().prev().css("background-color", "");
- }
+ $(document).on('ready ajax:complete', function() {
+ $('a.editable.required').each(function() {
+ var $tag = $(this);
+ if ($tag.hasClass("editable-empty")) {
+ $tag.parent().css("background-color", "#ffdddd");
+ $tag.parent().prev().css("background-color", "#ffdddd");
- }
+ else {
+ $tag.parent().css("background-color", "");
+ $tag.parent().prev().css("background-color", "");
}
+ run_pipeline_button_state();
+ } );
+
+ $(document).on('ajax:complete ready', function() {
+ var a = $('.arv-log-event-listener');
+ if (a.length > 0) {
+ $('.arv-log-event-listener').each(function() {
+ subscribeToEventLog(this.id);
+ });
+ }
});
- run_pipeline_button_state();
-});
+
+ $(document).on('arv-log-event', '.arv-log-event-handler-append-logs', function(event, eventData){
+ parsedData = JSON.parse(eventData);
+
+ propertyText = undefined
+
+ properties = parsedData.properties;
+ if (properties !== null) {
+ propertyText = properties.text;
+ }
+
+ if (propertyText !== undefined) {
+ $(this).append(propertyText + "<br/>");
+ } else {
+ $(this).append(parsedData.summary + "<br/>");
+ }
+ });
+
+})();
diff --cc apps/workbench/app/views/pipeline_instances/_show_components_editable.html.erb
index 11142a3,284c84c..e49839d
--- a/apps/workbench/app/views/pipeline_instances/_show_components_editable.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components_editable.html.erb
@@@ -23,9 -23,9 +23,9 @@@
<% @object.components.each do |k, component| %>
<% next if !component %>
<tr>
- <td><span class="label label-default"><%= k %></span></td>
+ <td><%= k %></td>
- <td><%= render_pipeline_component_attribute (editable && @object), :components, [k, :script], component[:script] %></td>
+ <td><%= component[:script] %></td>
<td>script version</td>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list