[ARVADOS] updated: e993707e7a20ec37f4023bcf709fc77adce3857d

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb      | 34 ++++++++++------------
 1 file changed, 16 insertions(+), 18 deletions(-)

       via  e993707e7a20ec37f4023bcf709fc77adce3857d (commit)
      from  2d10f584cafa6348a933a5714ec8a7744957005d (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 e993707e7a20ec37f4023bcf709fc77adce3857d
Author: radhika <radhika at curoverse.com>
Date:   Fri Nov 7 19:33:43 2014 -0500

    4024: rearrange partial handling

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 3fa76b1..71a7c76 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -167,29 +167,27 @@ class ApplicationController < ActionController::Base
   end
 
   def render_index
-    if params[:partial]
-      respond_to do |f|
-        f.json {
+    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: "show_#{params[:partial]}.html", formats: [:html]),
+            content: render_to_string(partial: "show_#{params[:partial]}", formats: [:html]),
                                       next_page_href: @next_page_href
 
           }
-        }
-      end
-    else
-      respond_to do |f|
-        f.json { render json: @objects }
-        f.html {
-          if params[:tab_pane]
-            render_pane params[:tab_pane]
-          else
-            render
-          end
-        }
-        f.js { render }
-      end
+        else
+          render json: @objects
+        end
+      }
+      f.html {
+        if params[:tab_pane]
+          render_pane params[:tab_pane]
+        else
+          render
+        end
+      }
+      f.js { render }
     end
   end
 

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


hooks/post-receive
--