[ARVADOS] updated: dd2634cad1db669ce19237805bb7fa83a1913d26

git at public.curoverse.com git at public.curoverse.com
Thu Jul 24 11:11:20 EDT 2014


Summary of changes:
 apps/workbench/app/assets/javascripts/editable.js  | 11 +++++-
 apps/workbench/app/assets/javascripts/tab_panes.js | 38 +++++++++++++++++++
 .../app/assets/stylesheets/application.css.scss    |  5 +++
 .../app/controllers/manage_account_controller.rb   | 43 ----------------------
 apps/workbench/app/controllers/users_controller.rb | 33 +++++++++++++++++
 apps/workbench/app/models/arvados_api_client.rb    |  7 +++-
 .../_manage_account.html.erb}                      |  4 +-
 .../_manage_current_token.html.erb}                |  0
 .../_manage_repositories.html.erb}                 |  2 +-
 .../_manage_ssh_keys.html.erb}                     |  8 ++--
 .../_manage_virtual_machines.html.erb}             |  4 +-
 .../app/views/users/manage_account.html.erb        |  1 +
 apps/workbench/config/routes.rb                    |  2 +-
 13 files changed, 103 insertions(+), 55 deletions(-)
 delete mode 100644 apps/workbench/app/controllers/manage_account_controller.rb
 rename apps/workbench/app/views/{manage_account/_show_manage_account.html.erb => users/_manage_account.html.erb} (81%)
 rename apps/workbench/app/views/{manage_account/_show_manage_current_token.html.erb => users/_manage_current_token.html.erb} (100%)
 rename apps/workbench/app/views/{manage_account/_show_manage_repositories.html.erb => users/_manage_repositories.html.erb} (93%)
 rename apps/workbench/app/views/{manage_account/_show_manage_ssh_keys.html.erb => users/_manage_ssh_keys.html.erb} (79%)
 rename apps/workbench/app/views/{manage_account/_show_manage_virtual_machines.html.erb => users/_manage_virtual_machines.html.erb} (85%)
 create mode 100644 apps/workbench/app/views/users/manage_account.html.erb

       via  dd2634cad1db669ce19237805bb7fa83a1913d26 (commit)
       via  15b37dc4af33f1b5fe3e5ca1773ff7cb53a80607 (commit)
       via  fdc4fd98ee963559ac13e737700a8be1f5c736c7 (commit)
       via  7223231e30b3e0e0b488f8db6d7b1749117a05e9 (commit)
       via  315312d808d6b8144d7638b108c0a02be3c14f46 (commit)
       via  fb77c937ac1e0fe4463cfe48c3b60f8a32e8c128 (commit)
      from  5adca9b05d740be31040477b43396f498429e6b3 (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 dd2634cad1db669ce19237805bb7fa83a1913d26
Merge: 15b37dc fdc4fd9
Author: radhika <radhika at curoverse.com>
Date:   Thu Jul 24 11:11:11 2014 -0400

    Merge branch 'master' into 3193-manage-account


commit 15b37dc4af33f1b5fe3e5ca1773ff7cb53a80607
Author: radhika <radhika at curoverse.com>
Date:   Thu Jul 24 11:10:20 2014 -0400

    3193: add manage account action to users controller.

diff --git a/apps/workbench/app/controllers/manage_account_controller.rb b/apps/workbench/app/controllers/manage_account_controller.rb
deleted file mode 100644
index 679db1c..0000000
--- a/apps/workbench/app/controllers/manage_account_controller.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-class ManageAccountController < ApplicationController
-
-  def model_class
-    AuthorizedKey
-  end
-
-  def index_pane_list
-    %w(Manage_account)
-  end
-
-  def index    
-    # repositories current user can read / write
-    @repo_links = []
-    Link.where(tail_uuid: current_user.uuid,
-               link_class: 'permission',
-               name: ['can_write', 'can_read']).
-          each do |perm_link|
-            @repo_links << perm_link[:head_uuid]
-          end
-    @repositories = Repository.where(uuid: @repo_links)
-
-    # virtual machines the current user can login into
-    @vm_logins = {}
-    Link.where(tail_uuid: current_user.uuid,
-               link_class: 'permission',
-               name: 'can_login').
-          each do |perm_link|
-            if perm_link.properties.andand[:username]
-              @vm_logins[perm_link.head_uuid] ||= []
-              @vm_logins[perm_link.head_uuid] << perm_link.properties[:username]
-            end
-          end
-    @virtual_machines = VirtualMachine.where(uuid: @vm_logins.keys)
-
-    # current user's ssh keys
-    filters=[["owner_uuid", "=", current_user.uuid]]
-    @ssh_keys = AuthorizedKey.where(key_type: 'SSH', filters: filters)
-    @objects = @ssh_keys
-
-    render_index
-  end
-
-end
diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 0313de5..8c2a680 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -210,6 +210,39 @@ class UsersController < ApplicationController
     end
   end
 
+  def manage_account
+    # repositories current user can read / write
+    repo_links = []
+    Link.where(tail_uuid: current_user.uuid,
+               link_class: 'permission',
+               name: ['can_write', 'can_read']).
+          each do |perm_link|
+            repo_links << perm_link[:head_uuid]
+          end
+    @my_repositories = Repository.where(uuid: repo_links)
+
+    # virtual machines the current user can login into
+    @my_vm_logins = {}
+    Link.where(tail_uuid: current_user.uuid,
+               link_class: 'permission',
+               name: 'can_login').
+          each do |perm_link|
+            if perm_link.properties.andand[:username]
+              @my_vm_logins[perm_link.head_uuid] ||= []
+              @my_vm_logins[perm_link.head_uuid] << perm_link.properties[:username]
+            end
+          end
+    @my_virtual_machines = VirtualMachine.where(uuid: @my_vm_logins.keys)
+
+    # current user's ssh keys
+    @my_ssh_keys = AuthorizedKey.where(key_type: 'SSH', owner_uuid: current_user.uuid)
+
+    respond_to do |f|
+#      f.js { render template: 'users/manage_account.js' }
+      f.html { render template: 'users/manage_account' }
+    end
+  end
+
   protected
 
   def find_current_links user
diff --git a/apps/workbench/app/views/manage_account/_show_manage_account.html.erb b/apps/workbench/app/views/users/_manage_account.html.erb
similarity index 81%
rename from apps/workbench/app/views/manage_account/_show_manage_account.html.erb
rename to apps/workbench/app/views/users/_manage_account.html.erb
index 06a3d44..76a0408 100644
--- a/apps/workbench/app/views/manage_account/_show_manage_account.html.erb
+++ b/apps/workbench/app/views/users/_manage_account.html.erb
@@ -14,7 +14,7 @@
         </div>
         <div id="manage_<%=section_id%>">
           <div class="panel-body">
-            <%= render partial: "show_manage_#{section_id}", locals: {repositories: @repositories, virtual_machines: @virtual_machines, vm_logins: @vm_logins, ssh_keys: @ssh_keys} %>
+            <%= render partial: "manage_#{section_id}" %>
           </div>
         </div>
       </div>
@@ -42,7 +42,7 @@
         </div>
         <div id="manage_<%=section_id%>">
           <div class="panel-body">
-            <%= render partial: "show_manage_#{section_id}", locals: {repositories: @repositories, virtual_machines: @virtual_machines, ssh_keys: @ssh_keys} %>
+            <%= render partial: "manage_#{section_id}" %>
           </div>
         </div>
       </div>
diff --git a/apps/workbench/app/views/manage_account/_show_manage_current_token.html.erb b/apps/workbench/app/views/users/_manage_current_token.html.erb
similarity index 100%
rename from apps/workbench/app/views/manage_account/_show_manage_current_token.html.erb
rename to apps/workbench/app/views/users/_manage_current_token.html.erb
diff --git a/apps/workbench/app/views/manage_account/_show_manage_repositories.html.erb b/apps/workbench/app/views/users/_manage_repositories.html.erb
similarity index 93%
rename from apps/workbench/app/views/manage_account/_show_manage_repositories.html.erb
rename to apps/workbench/app/views/users/_manage_repositories.html.erb
index 0733b98..9c6fb1e 100644
--- a/apps/workbench/app/views/manage_account/_show_manage_repositories.html.erb
+++ b/apps/workbench/app/views/users/_manage_repositories.html.erb
@@ -18,7 +18,7 @@
       </tr>
     </thead>
     <tbody>
-      <% @repositories.andand.each do |repo| %>
+      <% @my_repositories.andand.each do |repo| %>
         <tr>
           <td>
             <%= repo[:name] %>
diff --git a/apps/workbench/app/views/manage_account/_show_manage_ssh_keys.html.erb b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
similarity index 79%
rename from apps/workbench/app/views/manage_account/_show_manage_ssh_keys.html.erb
rename to apps/workbench/app/views/users/_manage_ssh_keys.html.erb
index c8245c1..f8eec71 100644
--- a/apps/workbench/app/views/manage_account/_show_manage_ssh_keys.html.erb
+++ b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
@@ -6,7 +6,7 @@
       <col style="width: 5%" />
     </colgroup>
     <tbody>
-      <% @ssh_keys.andand.each do |key| %>
+      <% @my_ssh_keys.andand.each do |key| %>
         <tr>
           <td>
             <%= key[:uuid] %>
@@ -33,8 +33,8 @@ Sample <code>~/.ssh/config</code>:
 <pre>
 Host *.arvados
   ProxyCommand ssh -p2222 turnout at switchyard.<%= current_api_host || 'xyzzy.arvadosapi.com' %> -x -a $SSH_PROXY_FLAGS %h
-<% if @vm_logins.andand.first %>
-  User <%= @vm_logins[@vm_logins.andand.keys.first].andand.first %>
+<% if @my_vm_logins.andand.first %>
+  User <%= @my_vm_logins[@my_vm_logins.andand.keys.first].andand.first %>
 <% end %>
 </pre>
 
@@ -43,7 +43,7 @@ Sample login command:
 </p>
 
 <pre>
-ssh <%= @virtual_machines.first.andand.hostname.andand.sub('.'+current_api_host,'') or 'vm-hostname' %>.arvados
+ssh <%= @my_virtual_machines.first.andand.hostname.andand.sub('.'+current_api_host,'') or 'vm-hostname' %>.arvados
 </pre>
 
 <p>
diff --git a/apps/workbench/app/views/manage_account/_show_manage_virtual_machines.html.erb b/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
similarity index 85%
rename from apps/workbench/app/views/manage_account/_show_manage_virtual_machines.html.erb
rename to apps/workbench/app/views/users/_manage_virtual_machines.html.erb
index 8eddb69..46310d7 100644
--- a/apps/workbench/app/views/manage_account/_show_manage_virtual_machines.html.erb
+++ b/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
@@ -18,13 +18,13 @@
       </tr>
     </thead>
     <tbody>
-      <% @virtual_machines.andand.each do |vm| %>
+      <% @my_virtual_machines.andand.each do |vm| %>
         <tr>
           <td>
             <%= vm[:hostname] %>
           </td>
           <td>
-            <%= @vm_logins[vm[:uuid]].andand.compact || [] %>
+            <%= @my_vm_logins[vm[:uuid]].andand.compact || [] %>
           </td>
           <td>
           </td>
diff --git a/apps/workbench/app/views/users/manage_account.html.erb b/apps/workbench/app/views/users/manage_account.html.erb
new file mode 100644
index 0000000..0751866
--- /dev/null
+++ b/apps/workbench/app/views/users/manage_account.html.erb
@@ -0,0 +1 @@
+<%= render :partial => 'manage_account' %>
diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index c7c5643..1f3d65f 100644
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -66,7 +66,7 @@ ArvadosWorkbench::Application.routes.draw do
     get 'choose', on: :collection
     post 'share_with', on: :member
   end
-  get '/manage_account' => 'manage_account#index'
+  get '/manage_account' => 'users#manage_account'
 
   post 'actions' => 'actions#post'
   get 'websockets' => 'websocket#index'

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list