[ARVADOS] updated: a8537e43ce618b6f71e7195a3c8d08c5c8909ad1

git at public.curoverse.com git at public.curoverse.com
Fri Mar 21 16:51:43 EDT 2014


Summary of changes:
 .../app/views/application/_paging.html.erb         |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

       via  a8537e43ce618b6f71e7195a3c8d08c5c8909ad1 (commit)
      from  6f1ecb3df81614ff2007088e55ca4ce51e6ae90b (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 a8537e43ce618b6f71e7195a3c8d08c5c8909ad1
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Mar 21 16:51:39 2014 -0400

    Fixed paging so that it won't fail if the necessary methods are missing on the results object.

diff --git a/apps/workbench/app/views/application/_paging.html.erb b/apps/workbench/app/views/application/_paging.html.erb
index 463e65a..df9d08d 100644
--- a/apps/workbench/app/views/application/_paging.html.erb
+++ b/apps/workbench/app/views/application/_paging.html.erb
@@ -11,7 +11,13 @@ min-width: 1.2em;
 }
 <% end %>
 
-<% if results.result_offset != nil and results.result_limit != nil and results.items_available != nil %>
+<% if results.respond_to? :result_offset and
+       results.respond_to? :result_limit and
+       results.respond_to? :items_available and
+       results.result_offset != nil and
+       results.result_limit != nil and
+       results.items_available != nil 
+%>
 <div class="index-paging">
   Displaying <%= results.result_offset+1 %> – 
   <%= if results.result_offset + results.result_limit > results.items_available 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list