[ARVADOS] updated: ba46f409f9c572263cb7907eb2f36139a2c0320b
git at public.curoverse.com
git at public.curoverse.com
Mon Sep 22 10:01:35 EDT 2014
Summary of changes:
apps/workbench/app/assets/javascripts/dates.js | 1 -
.../app/controllers/application_controller.rb | 2 +-
.../app/views/application/_content.html.erb | 2 +-
services/api/app/models/job.rb | 109 +++++++++++++++++++++
.../db/migrate/20140918153705_add_state_to_job.rb | 24 +++++
services/api/db/structure.sql | 11 ++-
services/api/test/unit/job_test.rb | 66 +++++++++++++
services/keepstore/handler_test.go | 4 +-
services/keepstore/handlers.go | 6 +-
services/keepstore/keepstore.go | 4 +-
.../{block_work_list.go => work_queue.go} | 42 ++++----
...{block_work_list_test.go => work_queue_test.go} | 30 +++---
12 files changed, 251 insertions(+), 50 deletions(-)
create mode 100644 services/api/db/migrate/20140918153705_add_state_to_job.rb
rename services/keepstore/{block_work_list.go => work_queue.go} (80%)
rename services/keepstore/{block_work_list_test.go => work_queue_test.go} (83%)
via ba46f409f9c572263cb7907eb2f36139a2c0320b (commit)
via bbb726b1c675cff7ef34704ecfa05353f971e951 (commit)
via ed413bb7071fe0d58a98828e89be21fef5681200 (commit)
via f47d364957c90269535d3992cd048ce5aef95cd0 (commit)
via 5ff389fc3450f97b62ef919109d6cc5691c96897 (commit)
via 411ba18c2288d67a802a422259c2678e3d4681a4 (commit)
via bd0d76fa76bbb0697c13487bb7d04f0b56d01a29 (commit)
via 5f4f8509e8fce0bcfb071188b5773a405b61f976 (commit)
via 3cc699f70a514878b7ce7adbc3c96e73f92fdf82 (commit)
via 4403160024a6de9d2bba41cf5377aa5c3d462500 (commit)
via 2bc8ce335b15136ce39b2652ab41e20b15632d08 (commit)
via f6cd6a5f0ca78c51c30e2689ca3d5a4caeb41073 (commit)
via 51444751090ef020a33a125c636f9afc099f6a46 (commit)
via 72fb7ca979e133064f0c41193222fe352f7fbf8a (commit)
via 3294cfcae73fe5b2cff051298b26076103251ca9 (commit)
via a4fc0448d97894d438fc770d7e5a890be8d8a01d (commit)
via d585a31fb1a2b2c4964ff2c8928a42358e8a060f (commit)
via 6d6ee07abb8892fb1e3f606c1347d18abc321ced (commit)
via 6137770472ef5b55fd604f87d303d6e07c7e3f2f (commit)
from 44d97727200a7efecd115cd01fb520f371ebfe3b (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 ba46f409f9c572263cb7907eb2f36139a2c0320b
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Sep 22 10:01:30 2014 -0400
3605: Fix tab param['tab_pane'] merge conflicts causing tests to fail.
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index d5260e1..1dec57c 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -212,8 +212,8 @@ class ApplicationController < ActionController::Base
render json: @object.attributes.merge(extra_attrs)
end
f.html {
- if params['tab_pane']
- render_pane(if params.is_a? Hash then params['tab_pane']["name"] else params['tab_pane'] end)
+ if params['tab_pane']
+ render_pane(if params['tab_pane'].is_a? Hash then params['tab_pane']["name"] else params['tab_pane'] end)
elsif request.method.in? ['GET', 'HEAD']
render
else
diff --git a/apps/workbench/app/views/application/_content.html.erb b/apps/workbench/app/views/application/_content.html.erb
index 65a518f..e37225c 100644
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@ -8,7 +8,7 @@
<li class="<%= 'active' if i==0 %>">
<a href="#<%= pane_name %>" data-toggle="tab"
class="pane-anchor"
- id="<%= pane %>-tab"
+ id="<%= pane_name %>-tab"
data-pane-content-url="<%= url_for(params.merge(tab_pane: pane)) %>">
<%= pane_name.gsub('_', ' ') %> <span id="<%= pane_name %>-count"></span>
</a>
commit bbb726b1c675cff7ef34704ecfa05353f971e951
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Sat Sep 20 16:42:58 2014 -0400
3605: Fix tab_pane rendering. Remove spurious console.log.
diff --git a/apps/workbench/app/assets/javascripts/dates.js b/apps/workbench/app/assets/javascripts/dates.js
index eeb6ede..b6eff83 100644
--- a/apps/workbench/app/assets/javascripts/dates.js
+++ b/apps/workbench/app/assets/javascripts/dates.js
@@ -1,7 +1,6 @@
jQuery(function($){
$(document).on('ajax:complete arv:pane:loaded ready', function() {
$('[data-utc-date]').each(function(i, elm) {
- console.log("woble!");
var v = $(elm).attr('data-utc-date').match(/(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d) UTC/);
if (!v) {
v = $(elm).attr('data-utc-date').match(/(\d\d\d\d)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)Z/);
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 756339e..d5260e1 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -212,8 +212,8 @@ class ApplicationController < ActionController::Base
render json: @object.attributes.merge(extra_attrs)
end
f.html {
- if params['tab_pane']
- render_pane params['tab_pane']
+ if params['tab_pane']
+ render_pane(if params.is_a? Hash then params['tab_pane']["name"] else params['tab_pane'] end)
elsif request.method.in? ['GET', 'HEAD']
render
else
commit ed413bb7071fe0d58a98828e89be21fef5681200
Merge: 44d9772 f47d364
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri Sep 19 16:42:03 2014 -0400
Merge remote-tracking branch 'origin/master' into 3605-improved-dashboard
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list