[ARVADOS] updated: 90d3c1bd6f2bc40e756d7f49665499c9e96547da

[Git user]

Summary of changes:
 .../app/controllers/application_controller.rb      |  2 +-
 .../app/controllers/work_units_controller.rb       | 25 ++--------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

       via  90d3c1bd6f2bc40e756d7f49665499c9e96547da (commit)
      from  a06f0b3b73169a74151ddec1cf9a99eddd2edc4f (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 90d3c1bd6f2bc40e756d7f49665499c9e96547da
Author: radhika <radhika at curoverse.com>
Date:   Thu Jul 14 18:44:09 2016 -0400

    9319: render_index enhanced

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 648cae8..442687e 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -176,7 +176,7 @@ class ApplicationController < ActionController::Base
         if params[:partial]
           @next_page_href = next_page_href(partial: params[:partial], filters: @filters.to_json)
           render json: {
-            content: render_to_string(partial: "show_#{params[:partial]}",
+            content: render_to_string(partial: "#{params[:partial_path] || ''}show_#{params[:partial]}",
                                       formats: [:html]),
             next_page_href: @next_page_href
           }
diff --git a/apps/workbench/app/controllers/work_units_controller.rb b/apps/workbench/app/controllers/work_units_controller.rb
index 7cc095b..7a45896 100644
--- a/apps/workbench/app/controllers/work_units_controller.rb
+++ b/apps/workbench/app/controllers/work_units_controller.rb
@@ -1,27 +1,4 @@
 class WorkUnitsController < ApplicationController
-  def render_index
-    respond_to do |f|
-      f.json {
-        if params[:partial]
-          @next_page_href = next_page_href(partial: params[:partial], filters: @filters.to_json)
-          render json: {
-            content: render_to_string(partial: "work_units/show_#{params[:partial]}",
-                                      formats: [:html]),
-            next_page_href: @next_page_href
-          }
-        else
-          render json: @objects
-        end
-      }
-      f.html {
-        render
-      }
-      f.js {
-        render
-      }
-    end
-  end
-
   def find_objects_for_index
     # If it's not the index rows partial display, just return
     # The /index request will again be invoked to display the
@@ -30,6 +7,7 @@ class WorkUnitsController < ApplicationController
 
     @limit = 20
     @filters = @filters || []
+
     # get next page of pipeline_instances
     filters = @filters + [["uuid", "is_a", ["arvados#pipelineInstance"]]]
     pipelines = PipelineInstance.limit(@limit).order(["created_at desc"]).filter(filters)
@@ -58,6 +36,7 @@ class WorkUnitsController < ApplicationController
       @next_page_filters += [['created_at', '<=', last_created_at.strftime("%Y-%m-%dT%H:%M:%S.%N%z")]]
       @next_page_filters += [['uuid', 'not in', last_uuids]]
       @next_page_href = url_for(partial: :all_processes_rows,
+                                partial_path: 'work_units/',
                                 filters: @next_page_filters.to_json)
       preload_links_for_objects(@objects.to_a)
     else

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


hooks/post-receive
--