[ARVADOS] updated: 78ae561901fff56fad51a5aea9c92f3cea6f4bb3

git at public.curoverse.com git at public.curoverse.com
Mon Oct 6 14:53:56 EDT 2014


Summary of changes:
 .../app/assets/javascripts/application.js          |   1 -
 .../app/controllers/actions_controller.rb          |  23 +++-
 .../app/controllers/collections_controller.rb      |  19 +--
 apps/workbench/app/helpers/provenance_helper.rb    |  13 +-
 .../app/views/application/_content.html.erb        |   1 +
 .../views/application/_title_and_buttons.html.erb  |  25 +++-
 .../app/views/collections/_show_files.html.erb     |   4 +-
 apps/workbench/app/views/jobs/show.html.erb        |  10 +-
 .../pipeline_instances/_show_tab_buttons.html.erb  |   9 +-
 .../app/views/pipeline_templates/show.html.erb     |   4 +-
 .../app/views/projects/_show_tab_contents.html.erb |   2 +-
 apps/workbench/app/views/projects/show.html.erb    |   6 +-
 .../test/functional/collections_controller_test.rb |  16 +++
 .../workbench/test/integration/collections_test.rb |  60 +++++----
 apps/workbench/test/integration/jobs_test.rb       |  33 ++---
 apps/workbench/test/integration/projects_test.rb   |  56 ++++----
 apps/workbench/test/test_helper.rb                 |   9 +-
 sdk/cli/bin/crunch-job                             | 141 +++++++++++++--------
 services/api/app/models/user.rb                    |  24 ++++
 .../test/fixtures/api_client_authorizations.yml    |   6 +
 services/api/test/fixtures/collections.yml         |   8 ++
 services/api/test/fixtures/groups.yml              |   9 ++
 services/api/test/fixtures/links.yml               |  33 +++++
 services/api/test/fixtures/users.yml               |  22 ++++
 .../functional/arvados/v1/links_controller_test.rb |  18 +++
 25 files changed, 394 insertions(+), 158 deletions(-)

       via  78ae561901fff56fad51a5aea9c92f3cea6f4bb3 (commit)
       via  cd69027bc08cb58316b53e8b02ca56f70b5b9eca (commit)
       via  c6b14938cfb90145dfcf9a8e5ea7264d63ac8035 (commit)
       via  d65963976174bd9c94fdb0b91eeb8a281f01e7b3 (commit)
       via  41190e074c3c4504b7627757250a1b188b86b54e (commit)
       via  2a34da95f13c361ef32d7bfba477b0de54c38cb0 (commit)
       via  ec9360b6e787b8e252d7f6ee6269e1241a4beacb (commit)
       via  5d0474c43296f2bac56c5b40e1d50ab0022a28b1 (commit)
       via  77e3dec8727c1fc00665531a39583c85b2c404bb (commit)
       via  c76954b90045782599660a069d01efca53d026a5 (commit)
       via  07f98aa421dd6b1cbe82817ca9d8540dba42f604 (commit)
       via  3e2927123ab9c6c8ab48b50ed65490f809e9e18a (commit)
       via  fb036b6bb6a63d4cf0e05f7b0fc3bae0ff1ef026 (commit)
       via  86b14bac0b6413dd033285a4357cc7edd05a22b3 (commit)
       via  b344d16c97448505432c0f0e9f9f964bfae07d50 (commit)
       via  4096f6dfa7b7f5dfbe230922fa8fe2f9bf4b280d (commit)
       via  4b3e5e50e262fc51a158c1aed1942b1ef176e2eb (commit)
       via  d7d1d0f327ddc42d2d06b836863f51e09793894b (commit)
       via  e79e5c258fe6ec542c3f2bb3c4230a5de2812b25 (commit)
       via  49c507b0bb60e35b951e2f4946c28d7c6729ce88 (commit)
       via  136f77bed67bd349fb73053379dcb7bae6a16592 (commit)
       via  fd7a118e0c88693efdb3662a5bd70b7cdb58eda3 (commit)
       via  55f0cfccfee8d366514a474d77cfff9befe44715 (commit)
       via  0a78f5a0efe0c88fddcd2ee91065f2a8da79055a (commit)
       via  350f4d5a3ef163b37de2b83bd6fefd37f1a35b8b (commit)
       via  1c638636ed50c1eafbf58d4f846b7b1e34c17cad (commit)
       via  6a9589b47e553bc3576c3f12492de68962af50d3 (commit)
       via  e8b1da0f4cf859ba6bc34e4390fbad097d7a00d9 (commit)
       via  8f6d2653d4ae4ce84f8e6699d0483bd2a9885f79 (commit)
       via  8af19c273f0d9b6a2711bd8a17b53d4b2f61c6c2 (commit)
       via  35729f8faeae665e5a706d56cfacf01e76de99a9 (commit)
       via  f19ce869a14511bb8031309a75fd9ee7acfeee6c (commit)
       via  37a349fc026e4559072e5b53c8855be42bf91dcd (commit)
       via  b1d1c5acf6f237d5e2a02414dd59e92cdb862237 (commit)
       via  fe8657ef0f8698837e9bdb5e9c1bf26a068efba9 (commit)
       via  982b439de0d2113c1e131e53bc6b8151901d77f9 (commit)
       via  a9a3fe7f94ebf14a5e70a642a596010572544424 (commit)
       via  f0358d88ba065369e70a89205ca1ad4ea4700cd1 (commit)
       via  257004f6162498831d1e47b81514e3311facde3b (commit)
       via  b7ab1e8793ea06c5b778ce2249b29f4ab1607c58 (commit)
       via  f35e15efbfe9466d8e08b939e5407e36454a0bc8 (commit)
       via  0e01a46b111ee565c236f3be8d8fed894fc35a5e (commit)
       via  1779b8427b66ae59340570f37c8f34e9ef2228f4 (commit)
       via  9f8d2cb25aa52f269f86eee71aee8bb66c8a0214 (commit)
       via  c5536580df437cfb2d9e96bbd29e254f57c53869 (commit)
      from  1cadb15617013ad5882ffaadc434536187618f06 (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 78ae561901fff56fad51a5aea9c92f3cea6f4bb3
Merge: cd69027 c6b1493
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date:   Mon Oct 6 14:53:08 2014 -0400

    Merge branch 'master' into 3634-tab-state
    
    Conflicts (resolved):
    	apps/workbench/app/views/application/_title_and_buttons.html.erb

diff --cc apps/workbench/app/views/application/_title_and_buttons.html.erb
index 1735478,822c904..4d54fd0
--- a/apps/workbench/app/views/application/_title_and_buttons.html.erb
+++ b/apps/workbench/app/views/application/_title_and_buttons.html.erb
@@@ -42,10 -44,23 +44,23 @@@
               selection_param: 'uuid',
               success: 'redirect-to-created-object'
             }.to_json),
-           { class: "btn btn-sm btn-primary force-cache-reload", remote: true, method: 'get' }) do %>
-         <i class="fa fa-fw fa-truck"></i> Move to project...
 -          { class: "btn btn-sm btn-primary", remote: true, method: 'get',
++          { class: "btn btn-sm btn-primary force-cache-reload", remote: true, method: 'get',
+             title: "Move this #{object_class} to a different project"}) do %>
+         <i class="fa fa-fw fa-truck"></i> Move <%=object_class%>...
        <% end %>
      <% end %>
    <% end %>
  <% end %>
  
+ <%
 -  # Display any flash messages in an alert. If there is any entry with "error" key, alert-danger is used. 
++  # Display any flash messages in an alert. If there is any entry with "error" key, alert-danger is used.
+   flash_msg = ''
+   flash_msg_is_error = false
+   flash.each do |msg|
+     flash_msg_is_error ||= (msg[0]=='error')
+     flash_msg += ('<p class="contain-align-left">' + msg[1] + '</p>')
+   end
+   if flash_msg != ''
+ %>
+ <div class="flash-message alert <%= flash_msg_is_error ? 'alert-danger' : 'alert-warning' %>"><%=flash_msg.html_safe%></div>
+ <% end %>

commit cd69027bc08cb58316b53e8b02ca56f70b5b9eca
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date:   Mon Oct 6 14:49:45 2014 -0400

    3634: add anchor to URL when switching project tabs

diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index 9fa37c9..a23a6d4 100644
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -222,7 +222,6 @@ jQuery(function($){
 window.addEventListener("DOMContentLoaded", function(e) {
     if(history.state) {
         if(history.state.nocache) {
-            console.log('no cache!');
             showLoadingModal();
             history.replaceState( {}, '' );
             location.reload(true);
diff --git a/apps/workbench/app/views/application/_content.html.erb b/apps/workbench/app/views/application/_content.html.erb
index c1cdd8a..e9fec77 100644
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@ -11,6 +11,7 @@
            id="<%= pane_name %>-tab"
            data-toggle="tab"
            data-tab-history=true
+           data-tab-history-update-url=true
            data-pane-content-url="<%= url_for(params.merge(tab_pane: pane_name)) %>">
           <%= pane_name.gsub('_', ' ') %> <span id="<%= pane_name %>-count"></span>
         </a>

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list