[ARVADOS] updated: f7a0c7d8d0a33686330802b2fe4ed6e632abafe1
git at public.curoverse.com
git at public.curoverse.com
Tue Feb 11 14:07:24 EST 2014
Summary of changes:
.../app/controllers/application_controller.rb | 9 --
.../app/views/users/_notifications.html.erb | 93 --------------------
2 files changed, 0 insertions(+), 102 deletions(-)
delete mode 100644 apps/workbench/app/views/users/_notifications.html.erb
via f7a0c7d8d0a33686330802b2fe4ed6e632abafe1 (commit)
from 18258f6a3762ba7d83b05260b3c22f71423c0373 (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 f7a0c7d8d0a33686330802b2fe4ed6e632abafe1
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Feb 11 14:08:25 2014 -0500
Fixed bug with notification triggering on wrong condition. Also removed old "notifications" partial.
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index d26a13e..cc452b9 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -312,15 +312,6 @@ class ApplicationController < ActionController::Base
}
@@notification_tests.push lambda { |controller, current_user|
- AuthorizedKey.limit(1).where(authorized_user_uuid: current_user.uuid).each do
- return nil
- end
- return lambda { |view|
- view.render partial: 'notifications/jobs_notification'
- }
- }
-
- @@notification_tests.push lambda { |controller, current_user|
Job.limit(1).where(created_by: current_user.uuid).each do
return nil
end
diff --git a/apps/workbench/app/views/users/_notifications.html.erb b/apps/workbench/app/views/users/_notifications.html.erb
deleted file mode 100644
index 0144dd2..0000000
--- a/apps/workbench/app/views/users/_notifications.html.erb
+++ /dev/null
@@ -1,93 +0,0 @@
-<% if current_user.andand.is_active %>
-
-<% if @my_ssh_keys.count == 0 || @showallalerts %>
- <div class="alert alert-info daxalert">
- <button type="button" class="close" data-dismiss="alert">×</button>
- <%= image_tag "dax.png", class: "dax" %>
- <div>
- Hi, I noticed that you have not yet set up an SSH public key for use with Arvados.
- <%= link_to "Click here to learn about SSH keys in Arvados.",
- "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access.html",
- style: "font-weight: bold",
- target: "_blank" %>
- When you have an SSH key you would like to use, paste the SSH public key
- in the text box.
- </div>
- <%= form_for AuthorizedKey.new, remote: true do |f| %>
- <div class="row-fluid">
- <div class="span12">
- <%= hidden_field_tag :return_to, request.original_url %>
- <%= hidden_field_tag :disable_element, 'input[type=submit]' %>
- <%= f.text_area :public_key, rows: 4, placeholder: "Paste your public key here", style: "width: 100%" %>
- </div>
- </div>
- <div class="row-fluid">
- <div class="span4 offset8">
- <%= f.submit :Save, value: raw("✓"), class: "btn btn-primary pull-right", style: "width: 100%" %>
- </div>
- </div>
- <% end %>
- </div>
-<% end %>
-
-<% if @my_collections.count == 0 || @showallalerts %>
-<div class="alert alert-info daxalert">
- <button type="button" class="close" data-dismiss="alert">×</button>
- <%= image_tag "dax.png", class: "dax" %>
- <p>
- Hi, I noticed you haven't uploaded a new collection yet.
- <%= link_to "Click here to learn how to upload data to Arvados Keep.",
- "#{Rails.configuration.arvados_docsite}/user/tutorials/tutorial-keep.html",
- style: "font-weight: bold", target: "_blank" %>
- </p>
-</div>
-
-<% end %>
-
-<% if @my_jobs.count == 0 || @showallalerts %>
-<div class="alert alert-info daxalert">
- <button type="button" class="close" data-dismiss="alert">×</button>
- <p><%= image_tag "dax.png", class: "dax" %>
- Hi, I noticed you haven't run a job yet.
- <%= link_to "Click here to learn how to run an Arvados Crunch job.",
- "#{Rails.configuration.arvados_docsite}/user/tutorials/tutorial-job1.html",
- style: "font-weight: bold",
- target: "_blank" %>
- </p>
-</div>
-<% end %>
-
-<% if @my_pipelines.count == 0 || @showallalerts %>
-<div class="alert alert-info daxalert">
- <button type="button" class="close" data-dismiss="alert">×</button>
-
-</div>
-<% end %>
-
-<% end %>
-
-<!--
-<% if current_user.andand.is_active %>
-<div class="well">
- <p><strong>System status</strong></p>
- <table>
- <% [Human, Trait, Collection, PipelineTemplate,
- PipelineInstance].each do |aclass| %>
- <tr>
- <td>
- <span style="margin-right: 2em">
- <a href="/<%= raw(aclass.to_s.pluralize.underscore) %>">
- <%= raw(aclass.to_s.pluralize.underscore.capitalize.gsub '_', ' ') %>
- </a>
- </span>
- </td>
- <td>
- <%= aclass.limit(0).where({}).items_available ||
- aclass.limit(4000).where({}).count %>
- </td>
- </tr>
- <% end %>
- </table>
-</div>
-<% end %>
--->
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list