[ARVADOS] updated: 180498df4db8c43080bb302bc56edea70c940583
git at public.curoverse.com
git at public.curoverse.com
Fri Feb 6 13:39:08 EST 2015
Summary of changes:
apps/workbench/app/assets/javascripts/application.js | 9 ++-------
.../app/assets/javascripts/request_shell_access.js | 11 +++++++++++
apps/workbench/app/controllers/users_controller.rb | 3 ---
apps/workbench/app/views/layouts/body.html.erb | 4 +---
.../views/users/_manage_virtual_machines.html.erb | 20 +++++++++-----------
apps/workbench/config/routes.rb | 1 -
6 files changed, 23 insertions(+), 25 deletions(-)
via 180498df4db8c43080bb302bc56edea70c940583 (commit)
from c6566ea328710818ab9b65db6187751f1874415c (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 180498df4db8c43080bb302bc56edea70c940583
Author: Radhika Chippada <radhika at curoverse.com>
Date: Fri Feb 6 13:38:18 2015 -0500
4951: localStorage lookup much simplified and handled during page loading.
diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index 8d92967..d80420b 100644
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -239,13 +239,8 @@ function hasHTML5History() {
return !!(window.history && window.history.pushState);
}
-function invokeUrlWithLocalStorageValue(url, alias, item) {
- value = localStorage.getItem(item);
- if (value) {
- window.location = alias;
- } else {
- window.location = url;
- }
+function getLocalStorageValue(item) {
+ return localStorage.getItem(item);
}
function clearLocalStorageValue(item) {
diff --git a/apps/workbench/app/assets/javascripts/request_shell_access.js b/apps/workbench/app/assets/javascripts/request_shell_access.js
index c8cbe34..9378c6b 100644
--- a/apps/workbench/app/assets/javascripts/request_shell_access.js
+++ b/apps/workbench/app/assets/javascripts/request_shell_access.js
@@ -1,3 +1,14 @@
+$(document).ready(function(){
+ var $noShellAccessDiv = $('#no_shell_access');
+ if ($noShellAccessDiv.length) {
+ if (getLocalStorageValue('request_shell_access') == 'sent') {
+ $('div').remove('.no_shell_access_msg');
+ } else {
+ $('div').remove('.shell_access_requested');
+ }
+ }
+ });
+
$(document).
on('click', "#request_shell_submit", function(e){
$(this).html('Sending request ...');
diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index dae9ae5..6d9d8cb 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -264,9 +264,6 @@ class UsersController < ApplicationController
# current user's ssh keys
@my_ssh_keys = AuthorizedKey.where(key_type: 'SSH', owner_uuid: current_user.uuid)
- # when localStorage indicating previous shell access request, the url used is "manage_acct"
- @local_storage_request_shell_access = true if request.url.include?('/manage_acct')
-
respond_to do |f|
f.html { render template: 'users/manage_account' }
end
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 8b1fd73..5b456ea 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -46,9 +46,7 @@
</a>
<ul class="dropdown-menu" role="menu">
<% if current_user.is_active %>
- <li id='manage_account_link' role="menuitem"><a href="#"
- onClick="invokeUrlWithLocalStorageValue('/manage_account', '/manage_acct', 'request_shell_access');"
- role="menuitem"><i class="fa fa-key fa-fw"></i> Manage account</a></li>
+ <li id='manage_account_link' role="menuitem"><a href="/manage_account" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage account</a></li>
<% if Rails.configuration.user_profile_form_fields %>
<li role="menuitem"><a href="/users/<%=current_user.uuid%>/profile" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage profile</a></li>
<% end %>
diff --git a/apps/workbench/app/views/users/_manage_virtual_machines.html.erb b/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
index b324572..5683316 100644
--- a/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
+++ b/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
@@ -6,24 +6,22 @@
</p>
<% if !@my_virtual_machines.any? %>
- <% if @local_storage_request_shell_access %>
+ <div id='no_shell_access' class='no_shell_access'>
<div id='shell_access_requested' class='shell_access_requested'>
<div class="alert alert-info">
<p class="contain-align-left">You do not have access to any virtual machines. A request was sent on your behalf.</p>
</div>
</div>
- <% else %>
- <div id='no_shell_access' class='no_shell_access'>
- <div id='no_shell_access_msg' class='no_shell_access_msg'>
- You do not have access to any virtual machines. Many of the Arvados features depend on having shell access to a hosted VM.
-
- <div style='display:inline-block'>
- <%= button_to('Request shell access', request_shell_access_user_url(id: current_user.uuid),
- id: 'request_shell_submit', class: 'btn btn-xs btn-primary', remote: true) %>
- </div>
+
+ <div id='no_shell_access_msg' class='no_shell_access_msg'>
+ You do not have access to any virtual machines. Many of the Arvados features depend on having shell access to a hosted VM.
+
+ <div style='display:inline-block'>
+ <%= button_to('Request shell access', request_shell_access_user_url(id: current_user.uuid),
+ id: 'request_shell_submit', class: 'btn btn-xs btn-primary', remote: true) %>
</div>
</div>
- <% end %>
+ </div>
<% else %>
<script> clearLocalStorageValue('request_shell_access'); </script>
<table class="table virtual-machines-table">
diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index a077c2e..7ed02e7 100644
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -42,7 +42,6 @@ ArvadosWorkbench::Application.routes.draw do
post 'request_shell_access', :on => :member
end
get '/manage_account' => 'users#manage_account'
- get '/manage_acct' => 'users#manage_account', :as => :manage_acct
get "/add_ssh_key_popup" => 'users#add_ssh_key_popup', :as => :add_ssh_key_popup
get "/add_ssh_key" => 'users#add_ssh_key', :as => :add_ssh_key
resources :logs
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list