[ARVADOS] updated: 1b4f261c2f7d8552f9d746931c84c09d894c0077

git at public.curoverse.com git at public.curoverse.com
Fri Aug 22 10:30:47 EDT 2014


Summary of changes:
 .../app/assets/javascripts/application.js          |  4 +-
 .../app/assets/javascripts/report_issue.js         |  2 +-
 .../app/assets/stylesheets/application.css.scss    |  6 +++
 .../app/controllers/actions_controller.rb          |  5 +-
 .../app/controllers/collections_controller.rb      | 25 ++++++++--
 .../app/controllers/projects_controller.rb         |  6 ++-
 apps/workbench/app/helpers/application_helper.rb   | 20 ++++++--
 apps/workbench/app/models/arvados_base.rb          |  2 +-
 apps/workbench/app/models/collection.rb            | 30 +++++++++++-
 .../views/application/_arvados_attr_value.html.erb |  6 +--
 .../application/_arvados_object_attr.html.erb      |  2 +-
 .../app/views/application/_report_error.html.erb   |  4 +-
 .../views/application/_report_issue_popup.html.erb |  8 +--
 .../app/views/application/_show_recent.html.erb    | 14 ++----
 apps/workbench/app/views/application/show.html.erb |  6 +--
 .../app/views/collections/_choose_rows.html.erb    | 18 +++++++
 .../app/views/collections/_index_tbody.html.erb    |  4 --
 .../app/views/collections/_show_files.html.erb     |  4 +-
 .../app/views/collections/_show_recent.html.erb    | 10 ++--
 .../app/views/collections/_toggle_persist.html.erb |  3 --
 apps/workbench/app/views/collections/show.html.erb | 33 ++++++++-----
 apps/workbench/app/views/layouts/body.html.erb     |  4 +-
 apps/workbench/app/views/links/_recent.html.erb    | 57 ----------------------
 .../workbench/test/integration/collections_test.rb | 35 +------------
 apps/workbench/test/integration/logins_test.rb     |  2 +
 .../test/integration/pipeline_instances_test.rb    |  4 +-
 sdk/python/arvados/collection.py                   |  3 ++
 sdk/python/arvados/commands/put.py                 | 10 +++-
 28 files changed, 166 insertions(+), 161 deletions(-)
 delete mode 100644 apps/workbench/app/views/collections/_toggle_persist.html.erb
 delete mode 100644 apps/workbench/app/views/links/_recent.html.erb

       via  1b4f261c2f7d8552f9d746931c84c09d894c0077 (commit)
       via  7a27da096af5e23e6339585094e6afbd3c2dedd0 (commit)
       via  1966eff7c92733225cd9fe1a4121ae0b8f1153d3 (commit)
       via  da8b7405a6d4c774ecdcaaec18ba57e3bb1e8249 (commit)
       via  66e40806c2f117519c986d2cbedfca50a71d44bd (commit)
       via  e951b096aa97b51adf0a0bcf08688e1379efbdb3 (commit)
       via  73bbd418892be34d89a1274d9bfe4218f96bf886 (commit)
       via  a3a84c13fff9ffee22c87fcd93d34a760227a89d (commit)
       via  a131e0cc10dc70e6192fae0b4e0bce138d98ec5c (commit)
       via  112d422913b3ef68723b113a50fece7d32d13ec2 (commit)
       via  e8670f2a3e44458c963bb4b08a57d812a9b9d902 (commit)
       via  f16be1736d705278ae39bde3fc6d6d9d1f302fa7 (commit)
       via  897e6cc8175865575a809e9fcc6d40ea566ee930 (commit)
       via  7c78bea1fde0f581e31338e860ecb89ef91285d9 (commit)
       via  c732e3d38ad324c46c43f9f3790ed7298eb392c2 (commit)
       via  e8566e29473ec12e3ceefbf87a87fac2b116e6d3 (commit)
       via  27697133a18371d692d69569659dd522e7b0fbdd (commit)
       via  289e5d15402d12ad02ac77e911aca7a32746c905 (commit)
       via  6db406e9a2fc78ed204460deb73151f44d94b030 (commit)
      from  1acc76ca7c9d4c641a9a0f30f3498be8febbbacd (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 1b4f261c2f7d8552f9d746931c84c09d894c0077
Merge: 7a27da0 1966eff
Author: radhika <radhika at curoverse.com>
Date:   Fri Aug 22 10:30:10 2014 -0400

    Merge branch 'master' into 3112-report-bug


commit 7a27da096af5e23e6339585094e6afbd3c2dedd0
Author: radhika <radhika at curoverse.com>
Date:   Fri Aug 22 10:29:35 2014 -0400

    3112: limit ajax event handling only to the report form

diff --git a/apps/workbench/app/assets/javascripts/report_issue.js b/apps/workbench/app/assets/javascripts/report_issue.js
index 482fd53..bb39d89 100644
--- a/apps/workbench/app/assets/javascripts/report_issue.js
+++ b/apps/workbench/app/assets/javascripts/report_issue.js
@@ -1,5 +1,5 @@
 // ajax handling for report-issue function
-$(document).
+$('#report-issue-modal-window form').
   on('ajax:send', function() {
     var $sendButton = $('#report-issue-submit');
     if ($sendButton) {
diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index c986f03..5d6acf3 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -244,3 +244,9 @@ div.pane-content iframe {
   width: 100%;
   border: none;
 }
+
+.text-overflow-ellipsis {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
diff --git a/apps/workbench/app/views/application/_report_error.html.erb b/apps/workbench/app/views/application/_report_error.html.erb
index 4bdc5df..5f33419 100644
--- a/apps/workbench/app/views/application/_report_error.html.erb
+++ b/apps/workbench/app/views/application/_report_error.html.erb
@@ -5,12 +5,12 @@
     api_request_url = api_error.andand.request_url ? api_error.request_url : ''
     api_error_response = api_error.andand.api_response ? api_error.api_response : ''
   %>
-  Send a problem report right here. <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.url, action_method: 'post', api_error_request_url: api_request_url, api_error_response: api_error_response),
+  Send a problem report right here. <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.url, current_path: request.fullpath, action_method: 'post', api_error_request_url: api_request_url, api_error_response: api_error_response),
         {class: 'btn btn-primary report-issue-modal-window', 'data-toggle' =>  "modal", 'data-target' => '#report-issue-modal-window', :remote => true, return_to: request.url} do %>
         <i class="fa fa-fw fa-support"></i> Report problem
   <% end %>
 <% else %>
-  Send a problem report right here. <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.url, action_method: 'post', error_message: error_message),
+  Send a problem report right here. <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.url, current_path: request.fullpath, action_method: 'post', error_message: error_message),
         {class: 'btn btn-primary report-issue-modal-window', 'data-toggle' =>  "modal", 'data-target' => '#report-issue-modal-window', :remote => true, return_to: request.url} do %>
         <i class="fa fa-fw fa-support"></i> Report problem
   <% end %>
diff --git a/apps/workbench/app/views/application/_report_issue_popup.html.erb b/apps/workbench/app/views/application/_report_issue_popup.html.erb
index 3efa6c4..f4f8551 100644
--- a/apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/apps/workbench/app/views/application/_report_issue_popup.html.erb
@@ -54,7 +54,7 @@
         <div class="form-group">
           <label for="current_page" class="col-sm-4 control-label"> Current page </label>
           <div class="col-sm-8">
-            <p class="form-control-static" name="current_page"><%=@popup_params[:current_location]%></a></p>
+            <p class="form-control-static text-overflow-ellipsis" name="current_page"><%=@popup_params[:current_path]%></a></p>
           </div>
         </div>
 
@@ -116,7 +116,7 @@
           <div class="form-group">
             <label for="error_message" class="col-sm-4 control-label"> Error message </label>
             <div class="col-sm-8">
-              <p class="form-control-static" name="error_mesasge"><%=@popup_params[:error_message]%></p>
+              <p class="form-control-static text-overflow-ellipsis" name="error_mesasge"><%=@popup_params[:error_message]%></p>
             </div>
           </div>
         <% end %>
@@ -125,7 +125,7 @@
           <div class="form-group">
             <label for="api_error_url" class="col-sm-4 control-label"> API error request url </label>
             <div class="col-sm-8">
-              <p class="form-control-static" name="api_error_url"><%=@popup_params[:api_error_request_url]%></p>
+              <p class="form-control-static text-overflow-ellipsis" name="api_error_url"><%=@popup_params[:api_error_request_url]%></p>
             </div>
           </div>
         <% end %>
@@ -134,7 +134,7 @@
           <div class="form-group">
             <label for="api_error_response" class="col-sm-4 control-label"> API error response </label>
             <div class="col-sm-8">
-              <p class="form-control-static" name="api_error_response"><%=@popup_params[:api_error_response]%></p>
+              <p class="form-control-static text-overflow-ellipsis" name="api_error_response"><%=@popup_params[:api_error_response]%></p>
             </div>
           </div>
         <% end %>
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 9bfd12c..ec8cdf2 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -137,12 +137,12 @@
               <li><%= link_to raw('<i class="fa fa-book fa-fw"></i> API Reference'), "#{Rails.configuration.arvados_docsite}/api", target: "_blank" %></li>
               <li><%= link_to raw('<i class="fa fa-book fa-fw"></i> SDK Reference'), "#{Rails.configuration.arvados_docsite}/sdk", target: "_blank" %></li>
               <li role="presentation" class="divider"></li>
-              <li> <%= link_to report_issue_popup_path(popup_type: 'version', current_location: request.url, action_method: 'post'),
+              <li> <%= link_to report_issue_popup_path(popup_type: 'version', current_location: request.url, current_path: request.fullpath, action_method: 'post'),
                       {class: 'report-issue-modal-window', 'data-toggle' =>  "modal", 'data-target' => '#report-issue-modal-window', :remote => true, return_to: request.url} do %>
                        <i class="fa fa-fw fa-support"></i> Show version / debugging info ...
                       <% end %>
               </li>
-              <li> <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.url, action_method: 'post'),
+              <li> <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.url, current_path: request.fullpath, action_method: 'post'),
                       {class: 'report-issue-modal-window', 'data-toggle' =>  "modal", 'data-target' => '#report-issue-modal-window', :remote => true, return_to: request.url} do %>
                        <i class="fa fa-fw fa-support"></i> Report a problem ...
                       <% end %>

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list