[ARVADOS] created: 03e97bd44af71b03a58d162f7c02f104eed2df7c
git at public.curoverse.com
git at public.curoverse.com
Tue Nov 25 17:57:55 EST 2014
at 03e97bd44af71b03a58d162f7c02f104eed2df7c (commit)
commit 03e97bd44af71b03a58d162f7c02f104eed2df7c
Author: Brett Smith <brett at curoverse.com>
Date: Tue Nov 25 17:57:47 2014 -0500
WIP
diff --git a/apps/workbench/app/views/collections/_sharing_button.html.erb b/apps/workbench/app/views/collections/_sharing_button.html.erb
index fc81e70..ae91552 100644
--- a/apps/workbench/app/views/collections/_sharing_button.html.erb
+++ b/apps/workbench/app/views/collections/_sharing_button.html.erb
@@ -7,7 +7,7 @@ disable this feature entirely. %>
<%= link_to "Unshare", unshare_collection_url, {
class: 'btn-xs btn-info',
remote: true,
- method: 'post'
+ method: :post,
} %></span>
<div class="smaller-text" style="word-break: break-all"><%= link_to download_link, download_link %></div>
</div>
@@ -15,7 +15,7 @@ disable this feature entirely. %>
<%= link_to "Create sharing link", share_collection_url, {
class: 'btn-xs btn-info',
remote: true,
- method: 'post'
+ method: :post,
} %>
<% end %>
<% end %>
diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 76d8731..3a170f2 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -38,12 +38,12 @@ function unselect_all_files() {
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
<li><%= link_to "Create new collection with selected files", '#',
+ method: :post,
'data-href' => combine_selected_path(
action_data: {current_project_uuid: @object.owner_uuid}.to_json
),
'data-selection-param-name' => 'selection[]',
'data-selection-action' => 'combine-collections',
- 'method' => 'post',
'data-toggle' => 'dropdown'
%></li>
</ul>
diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb
index 6ebb3b2..39651cc 100644
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -5,10 +5,10 @@
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
<li><%= link_to "Create new collection with selected collections", '#',
+ method: :post,
'data-href' => combine_selected_path,
'data-selection-param-name' => 'selection[]',
'data-selection-action' => 'combine-collections',
- 'method' => 'post',
'data-toggle' => 'dropdown'
%></li>
</ul>
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 9e966e1..035d147 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -161,7 +161,7 @@
&block)
end,
:top_button => Proc.new do %>
- <% link_to projects_path, method: 'post', class: 'btn btn-xs btn-default pull-right' do %>
+ <% link_to projects_path, method: :post, class: 'btn btn-xs btn-default pull-right' do %>
<i class="fa fa-plus"></i> New project
<% end %>
<% end %>
diff --git a/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb b/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb
index 252b93a..a1749a7 100644
--- a/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb
+++ b/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb
@@ -38,7 +38,7 @@
'pipeline_instance[description]' => "Created at #{Time.now.localtime}" + (ob.name.andand.size.andand>0 ? " using the pipeline template *#{ob.name}*" : ""),
'success' => 'redirect-to-created-object'
}.to_json),
- { class: "btn btn-default btn-xs", title: "Run #{ob.name}", remote: true, method: 'get' }
+ { class: "btn btn-default btn-xs", title: "Run #{ob.name}", remote: true, method: :get }
) do %>
<i class="fa fa-fw fa-play"></i> Run
<% end %>
diff --git a/apps/workbench/app/views/pipeline_templates/show.html.erb b/apps/workbench/app/views/pipeline_templates/show.html.erb
index 02ebd6d..0faa48f 100644
--- a/apps/workbench/app/views/pipeline_templates/show.html.erb
+++ b/apps/workbench/app/views/pipeline_templates/show.html.erb
@@ -10,7 +10,7 @@
'pipeline_instance[description]' => "Created at #{Time.now.localtime}" + (@object.name.andand.size.andand>0 ? " using the pipeline template *#{@object.name}*" : ""),
'success' => 'redirect-to-created-object'
}.to_json),
- { class: "btn btn-primary btn-sm", remote: true, method: 'get', title: 'Run this pipeline' }
+ { class: "btn btn-primary btn-sm", remote: true, title: 'Run this pipeline' }
) do %>
<i class="fa fa-gear"></i> Run this pipeline
<% end %>
diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index 0d71f94..40f319f 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -11,7 +11,7 @@
action_href: pipeline_instances_path,
action_method: 'post',
action_data: {'selection_param' => 'pipeline_instance[pipeline_template_uuid]', 'pipeline_instance[owner_uuid]' => current_user.uuid, 'success' => 'redirect-to-created-object'}.to_json),
- { class: "btn btn-primary btn-xs", remote: true, method: 'get' }) do %>
+ { class: "btn btn-primary btn-xs", remote: true }) do %>
<i class="fa fa-fw fa-gear"></i> Run a pipeline...
<% end %>
</span>
diff --git a/apps/workbench/app/views/projects/_show_sharing.html.erb b/apps/workbench/app/views/projects/_show_sharing.html.erb
index cc862c4..480f401 100644
--- a/apps/workbench/app/views/projects/_show_sharing.html.erb
+++ b/apps/workbench/app/views/projects/_show_sharing.html.erb
@@ -45,7 +45,7 @@
action_href: share_with_project_path,
action_name: 'Add',
action_data: {selection_param: 'uuids[]', success: 'tab-refresh'}.to_json),
- class: "btn btn-primary btn-sm", remote: true, method: 'get') do %>
+ class: "btn btn-primary btn-sm", remote: true) do %>
<i class="fa fa-fw fa-plus"></i> Share with <%= share_class %>…
<% end %>
diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
index 1ef7fbd..c9917a1 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -10,9 +10,9 @@
action_data: {current_project_uuid: @object.uuid}.to_json
),
'id' => 'combine_selections_button',
+ method: :post,
'data-selection-param-name' => 'selection[]',
'data-selection-action' => 'combine-project-contents',
- 'method' => 'post',
'data-toggle' => 'dropdown'
%></li>
<li><%= link_to "Compare selected", 'action',
@@ -53,11 +53,11 @@
'data-selection-action' => 'move'
%></li>
<li><%= link_to "Remove selected", '#',
+ method: :delete,
'data-href' => url_for(action: :remove_items),
'data-selection-param-name' => 'item_uuids[]',
'data-selection-action' => 'remove',
'data-remote' => true,
- 'method' => 'delete',
'data-toggle' => 'dropdown'
%></li>
</ul>
diff --git a/apps/workbench/app/views/projects/show.html.erb b/apps/workbench/app/views/projects/show.html.erb
index 0429f33..7a9eda0 100644
--- a/apps/workbench/app/views/projects/show.html.erb
+++ b/apps/workbench/app/views/projects/show.html.erb
@@ -14,7 +14,7 @@
action_href: actions_path(id: @object.uuid),
action_method: 'post',
action_data: {selection_param: 'selection[]', copy_selections_into_project: @object.uuid, success: 'page-refresh'}.to_json),
- { class: "btn btn-primary btn-sm", remote: true, method: 'get', title: "Add data to this project", data: {'event-after-select' => 'page-refresh'} }) do %>
+ { class: "btn btn-primary btn-sm", remote: true, title: "Add data to this project", data: {'event-after-select' => 'page-refresh'} }) do %>
<i class="fa fa-fw fa-plus"></i> Add data...
<% end %>
<%= link_to(
@@ -24,10 +24,10 @@
action_href: pipeline_instances_path,
action_method: 'post',
action_data: {'selection_param' => 'pipeline_instance[pipeline_template_uuid]', 'pipeline_instance[owner_uuid]' => @object.uuid, 'success' => 'redirect-to-created-object'}.to_json),
- { class: "btn btn-primary btn-sm", remote: true, method: 'get', title: "Run a pipeline in this project" }) do %>
+ { class: "btn btn-primary btn-sm", remote: true, title: "Run a pipeline in this project" }) do %>
<i class="fa fa-fw fa-gear"></i> Run a pipeline...
<% end %>
- <%= link_to projects_path({'project[owner_uuid]' => @object.uuid, 'options' => {'ensure_unique_name' => true}}), method: 'post', title: "Add a subproject to this project", class: 'btn btn-sm btn-primary' do %>
+ <%= link_to projects_path({'project[owner_uuid]' => @object.uuid, 'options' => {'ensure_unique_name' => true}}), method: :post, title: "Add a subproject to this project", class: 'btn btn-sm btn-primary' do %>
<i class="fa fa-fw fa-plus"></i>
Add a subproject
<% end %>
diff --git a/apps/workbench/app/views/user_agreements/index.html.erb b/apps/workbench/app/views/user_agreements/index.html.erb
index d73ccff..4c80caf 100644
--- a/apps/workbench/app/views/user_agreements/index.html.erb
+++ b/apps/workbench/app/views/user_agreements/index.html.erb
@@ -9,7 +9,7 @@ User agreements
<% end %>
<% end %>
-<%= form_for(unsigned_user_agreements.first, {url: {action: 'sign', controller: 'user_agreements'}, method: 'post'}) do |f| %>
+<%= form_for(unsigned_user_agreements.first, {url: {action: 'sign', controller: 'user_agreements'}, method: :post}) do |f| %>
<%= hidden_field_tag :return_to, request.url %>
<div id="open_user_agreement">
<div class="alert alert-info">
diff --git a/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb b/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
index efa8cae..8cd5ae3 100644
--- a/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
+++ b/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
@@ -1,7 +1,7 @@
<div class="modal-dialog modal-with-loading-spinner">
<div class="modal-content">
- <%= form_tag add_ssh_key_path, {method: 'get', id: 'add_new_key_form', name: 'add_new_key_form', class: 'form-search, new_authorized_key', remote: true} do %>
+ <%= form_tag add_ssh_key_path, {method: :get, id: 'add_new_key_form', name: 'add_new_key_form', class: 'form-search, new_authorized_key', remote: true} do %>
<div class="modal-header">
<button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">×</button>
@@ -14,7 +14,7 @@
<div class="modal-body">
<div> <%= link_to "Click here to learn about SSH keys in Arvados.",
- "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html",
+ "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html",
style: "font-weight: bold",
target: "_blank" %>
</div>
diff --git a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
index 17b64b2..34dbb59 100644
--- a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
+++ b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
@@ -2,7 +2,7 @@
<% if !@my_ssh_keys.any? %>
<p> You have not yet set up an SSH public key for use with Arvados. </p>
<p> <%= link_to "Click here",
- "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html",
+ "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html",
style: "font-weight: bold",
target: "_blank" %> to learn about SSH keys in Arvados.
</p>
@@ -43,7 +43,7 @@
<% end %>
</td>
<td>
- <%= link_to(authorized_key_path(id: key[:uuid]), method: 'delete', class: 'btn btn-sm', data: {confirm: "Really delete key?"}) do %>
+ <%= link_to(authorized_key_path(id: key[:uuid]), method: :delete, class: 'btn btn-sm', data: {confirm: "Really delete key?"}) do %>
<i class="fa fa-fw fa-trash-o"></i>
<% end %>
</td>
diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index e9429cf..f525635 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -1,7 +1,7 @@
<div class="modal-dialog modal-with-loading-spinner">
<div class="modal-content">
- <%= form_tag setup_user_path, {id: 'setup_form', name: 'setup_form', method: 'get',
+ <%= form_tag setup_user_path, {id: 'setup_form', name: 'setup_form', method: :get,
class: 'form-search', remote: true} do %>
<div class="modal-header">
diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index 45ca939..b0f5753 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -1,7 +1,7 @@
<% if current_user.andand.is_active %>
<div>
<strong>Recent jobs</strong>
- <%= link_to '(refresh)', {format: :js}, {class: 'refresh', remote: true, method: 'get'} %>
+ <%= link_to '(refresh)', {format: :js}, {class: 'refresh', remote: true} %>
<%= link_to raw("Show all jobs →"), jobs_path, class: 'pull-right' %>
<% if not current_user.andand.is_active or @my_jobs.empty? %>
<p>(None)</p>
@@ -109,7 +109,7 @@
<div>
<strong>Recent pipeline instances</strong>
- <%= link_to '(refresh)', {format: :js}, {class: 'refresh', remote: true, method: 'get'} %>
+ <%= link_to '(refresh)', {format: :js}, {class: 'refresh', remote: true} %>
<%= link_to raw("Show all pipeline instances →"), pipeline_instances_path, class: 'pull-right' %>
<% if not current_user.andand.is_active or @my_pipelines.empty? %>
<p>(None)</p>
@@ -168,7 +168,7 @@
<div>
<strong>Recent collections</strong>
- <%= link_to '(refresh)', {format: :js}, {class: 'refresh', remote: true, method: 'get'} %>
+ <%= link_to '(refresh)', {format: :js}, {class: 'refresh', remote: true} %>
<%= link_to raw("Show all collections →"), collections_path, class: 'pull-right' %>
<div class="pull-right" style="padding-right: 1em; width: 30%;">
<%= form_tag collections_path,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list