[ARVADOS] updated: 549adc0fdf4731cee1bae2aac58b959266db26d7

git at public.curoverse.com git at public.curoverse.com
Tue Feb 16 12:01:31 EST 2016


Summary of changes:
 .../views/application/_projects_tree_menu.html.erb |  5 +++
 apps/workbench/test/integration/projects_test.rb   | 10 ++++-
 .../v1/api_client_authorizations_controller.rb     | 19 +++++++---
 .../api/app/models/api_client_authorization.rb     | 12 +-----
 ...8210629_add_uuid_to_api_client_authorization.rb | 28 ++++++++++++++
 ...209155729_add_uuid_to_api_token_search_index.rb | 21 +++++++++++
 services/api/db/structure.sql                      | 18 +++++++--
 .../test/fixtures/api_client_authorizations.yml    | 36 ++++++++++++++++++
 .../api_client_authorizations_controller_test.rb   | 44 ++++++++++++++++++++++
 9 files changed, 172 insertions(+), 21 deletions(-)
 create mode 100644 services/api/db/migrate/20160208210629_add_uuid_to_api_client_authorization.rb
 create mode 100644 services/api/db/migrate/20160209155729_add_uuid_to_api_token_search_index.rb

       via  549adc0fdf4731cee1bae2aac58b959266db26d7 (commit)
       via  57d5e8e0f8e8c3871e2d95d14e3088c0a3f41a9b (commit)
       via  f341c6a22325ab4de54a10c7262e3975fad36851 (commit)
       via  80d28abfb972c34d7769fbfeac5e3b67049f216b (commit)
       via  b6afb1ac149e6771acd678ac6b4fd2e0afdedb0b (commit)
       via  5581071fcacaf5981f5149a30144d06ddd170a3e (commit)
       via  2d6884f5b20c349e7fd28a51cd876d40524186ad (commit)
       via  d7e559136a7ed5ee3f178b26aa2b5924cea1bca7 (commit)
       via  13163d646a6da8d53984dfb54d365cdfb90afde3 (commit)
       via  54e24a7233fe2dd4c84c9c6a54262f2858400f92 (commit)
       via  58af12227014f0881b94462f8dc0990fc46ab818 (commit)
       via  cec0f7c11949b55b1c1589700641788ee3fd3ec4 (commit)
      from  c592f178659ed5ebfd03720a02940daa62931d14 (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 549adc0fdf4731cee1bae2aac58b959266db26d7
Author: radhika <radhika at curoverse.com>
Date:   Tue Feb 16 12:00:09 2016 -0500

    8286: also include link to Home in favorites section of the Projects dropdown, so that the user does not have to scroll through all of his favorites to seek in MyProjects section.

diff --git a/apps/workbench/app/views/application/_projects_tree_menu.html.erb b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
index ad2620d..a680c69 100644
--- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb
+++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
@@ -3,6 +3,11 @@
   <li role="presentation" class="dropdown-header">
     My favorite projects
   </li>
+  <li>
+    <%= project_link_to.call({object: current_user, depth: 0}) do %>
+      <span style="padding-left: 0">Home</span>
+    <% end %>
+  </li>
   <% (starred_projects).each do |pnode| %>
     <li>
       <%= project_link_to.call({object: pnode, depth: 0}) do%>
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 2cc6a45..01e84b1 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -39,7 +39,10 @@ class ProjectsTest < ActionDispatch::IntegrationTest
   test 'Create a project and move it into a different project' do
     visit page_with_token 'active', '/projects'
     find("#projects-menu").click
-    find(".dropdown-menu a", text: "Home").click
+    within('.dropdown-menu') do
+      first('li', text: 'Home').click
+    end
+    wait_for_ajax
     find('.btn', text: "Add a subproject").click
 
     within('h2') do
@@ -51,7 +54,10 @@ class ProjectsTest < ActionDispatch::IntegrationTest
 
     visit '/projects'
     find("#projects-menu").click
-    find(".dropdown-menu a", text: "Home").click
+    within('.dropdown-menu') do
+      first('li', text: 'Home').click
+    end
+    wait_for_ajax
     find('.btn', text: "Add a subproject").click
     within('h2') do
       find('.fa-pencil').click

commit 57d5e8e0f8e8c3871e2d95d14e3088c0a3f41a9b
Merge: c592f17 f341c6a
Author: radhika <radhika at curoverse.com>
Date:   Mon Feb 15 21:33:01 2016 -0500

    Merge branch 'master' into 8286-fav-projects


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list