From 6aac88a912ded276ed151501ac3977cfcc78600d Mon Sep 17 00:00:00 2001 From: radhika Date: Thu, 23 Jul 2015 09:55:02 -0400 Subject: [PATCH] 6588: split manage account --- apps/workbench/app/controllers/users_controller.rb | 1 + apps/workbench/app/views/layouts/body.html.erb | 7 +++++++ apps/workbench/app/views/users/_manage_account.html.erb | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb index 4cf1fffc09..84d6cfd73c 100644 --- a/apps/workbench/app/controllers/users_controller.rb +++ b/apps/workbench/app/controllers/users_controller.rb @@ -297,6 +297,7 @@ class UsersController < ApplicationController # current user's ssh keys @my_ssh_keys = AuthorizedKey.where(key_type: 'SSH', owner_uuid: current_user.uuid) + @page = params["page"] 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 0f90c416f0..a32b41c84d 100644 --- a/apps/workbench/app/views/layouts/body.html.erb +++ b/apps/workbench/app/views/layouts/body.html.erb @@ -56,7 +56,14 @@ <% if current_user.is_active %>
  • Home project
  • + +
  • <%= link_to raw(' Virtual Machines'), manage_account_path(page: "manage_virtual_machines") %>
  • +
  • <%= link_to raw(' Repositories'), manage_account_path(page: "manage_repositories") %>
  • +
  • <%= link_to raw(' SSH Keys'), manage_account_path(page: "manage_ssh_keys") %>
  • +
  • <%= link_to raw(' Current Token'), manage_account_path(page: "manage_current_token") %>
  • +
  • Manage account
  • + <% if Rails.configuration.user_profile_form_fields %>
  • Manage profile
  • <% end %> diff --git a/apps/workbench/app/views/users/_manage_account.html.erb b/apps/workbench/app/views/users/_manage_account.html.erb index 4a362cd629..196e85e809 100644 --- a/apps/workbench/app/views/users/_manage_account.html.erb +++ b/apps/workbench/app/views/users/_manage_account.html.erb @@ -1,3 +1,7 @@ +<% if @page %> +
    + <%= render partial: @page %> +<% else %>
    @@ -17,6 +21,7 @@ <%= render partial: "manage_current_token" %>
    +<% end %> <%= render partial: "add_repository_modal" %>
    -- 2.39.5