[ARVADOS] updated: 89fccf123374c67e738381ea840e3535b2d1074f
git at public.curoverse.com
git at public.curoverse.com
Tue Aug 4 16:42:18 EDT 2015
Summary of changes:
apps/workbench/app/controllers/users_controller.rb | 6 ------
apps/workbench/app/views/layouts/body.html.erb | 6 ------
.../app/views/users/_manage_account.html.erb | 22 ----------------------
.../app/views/users/manage_account.html.erb | 1 -
apps/workbench/config/routes.rb | 1 -
.../test/integration/application_layout_test.rb | 2 --
..._account_test.rb => user_settings_menu_test.rb} | 2 +-
7 files changed, 1 insertion(+), 39 deletions(-)
delete mode 100644 apps/workbench/app/views/users/_manage_account.html.erb
delete mode 100644 apps/workbench/app/views/users/manage_account.html.erb
rename apps/workbench/test/integration/{user_manage_account_test.rb => user_settings_menu_test.rb} (99%)
via 89fccf123374c67e738381ea840e3535b2d1074f (commit)
from cca0d86de72487988b1a7d657e67143121461a0f (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 89fccf123374c67e738381ea840e3535b2d1074f
Author: Manoj <jonam33 at gmail.com>
Date: Tue Aug 4 16:41:18 2015 -0400
6588: Removed manage account button, modified tests and deleted views.
diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 4a88983..d2fcbbb 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -299,12 +299,6 @@ class UsersController < ApplicationController
@my_ssh_keys = AuthorizedKey.where(key_type: 'SSH', owner_uuid: @object.uuid)
end
- def manage_account
- repositories
- virtual_machines
- ssh_keys
- end
-
def add_ssh_key_popup
respond_to do |format|
format.html
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 73c0b8c..c459494 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -74,12 +74,6 @@
<% end %>
</li>
- <li role="menuitem">
- <%= link_to manage_account_user_path(current_user), role: 'menu-item' do %>
- <i class="fa fa-lg fa-key fa-fw"></i> Manage account
- <% end %>
- </li>
-
<% if Rails.configuration.user_profile_form_fields %>
<li role="menuitem"><a href="/users/<%=current_user.uuid%>/profile" role="menuitem"><i class="fa fa-lg fa-user fa-fw"></i> Manage profile</a></li>
<% end %>
diff --git a/apps/workbench/app/views/users/_manage_account.html.erb b/apps/workbench/app/views/users/_manage_account.html.erb
deleted file mode 100644
index d648621..0000000
--- a/apps/workbench/app/views/users/_manage_account.html.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="col-sm-6">
- <div class="panel-group" id="arv-adv-accordion">
- <div class="panel panel-default">
- <%= render partial: "virtual_machines" %>
- </div>
- <div class="panel panel-default">
- <%= render partial: "repositories" %>
- </div>
- </div>
-</div>
-<div class="col-sm-6">
- <div class="panel-group" id="arv-adv-accordion">
- <div class="panel panel-default">
- <%= render partial: "ssh_keys" %>
- </div>
- <div class="panel panel-default">
- <%= render partial: "current_token" %>
- </div>
- </div>
- <div id="add-ssh-key-modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
- <%= render partial: "add_repository_modal" %>
-</div>
diff --git a/apps/workbench/app/views/users/manage_account.html.erb b/apps/workbench/app/views/users/manage_account.html.erb
deleted file mode 100644
index 0751866..0000000
--- a/apps/workbench/app/views/users/manage_account.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :partial => 'manage_account' %>
diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 1b14f53..487fb3f 100644
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -46,7 +46,6 @@ ArvadosWorkbench::Application.routes.draw do
get 'setup_popup', :on => :member
get 'profile', :on => :member
post 'request_shell_access', :on => :member
- get 'manage_account', :on => :member
get 'virtual_machines', :on => :member
get 'repositories', :on => :member
get 'ssh_keys', :on => :member
diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index f5ce694..a8932d7 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -54,7 +54,6 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
assert_selector "a[href=\"/users/#{user['uuid']}/repositories\"]", text: 'Repositories'
assert_selector "a[href=\"/current_token\"]", text: 'Current token'
assert_selector "a[href=\"/users/#{user['uuid']}/ssh_keys\"]", text: 'SSH keys'
- assert_selector "a[href=\"/users/#{user['uuid']}/manage_account\"]", text: 'Manage account'
if profile_config
assert_selector "a[href=\"/users/#{user['uuid']}/profile\"]", text: 'Manage profile'
@@ -67,7 +66,6 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
assert page.has_no_link?('Repositories'), 'Found link - Repositories'
assert page.has_no_link?('Current token'), 'Found link - Current token'
assert page.has_no_link?('SSH keys'), 'Found link - SSH keys'
- assert page.has_no_link?('Manage account'), 'Found link - Manage account'
assert page.has_no_link?('Manage profile'), 'Found link - Manage profile'
end
assert page.has_link?('Log out'), 'No link - Log out'
diff --git a/apps/workbench/test/integration/user_manage_account_test.rb b/apps/workbench/test/integration/user_settings_menu_test.rb
similarity index 99%
rename from apps/workbench/test/integration/user_manage_account_test.rb
rename to apps/workbench/test/integration/user_settings_menu_test.rb
index 08fb031..c2a2f8a 100644
--- a/apps/workbench/test/integration/user_manage_account_test.rb
+++ b/apps/workbench/test/integration/user_settings_menu_test.rb
@@ -1,6 +1,6 @@
require 'integration_helper'
-class UserManageAccountTest < ActionDispatch::IntegrationTest
+class UserSettingsMenuTest < ActionDispatch::IntegrationTest
setup do
need_javascript
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list