From: Tom Clegg <tom@curoverse.com>
Date: Mon, 2 Jun 2014 15:07:47 +0000 (-0400)
Subject: 2872: Fix bugs
X-Git-Tag: 1.1.0~2551^2~60
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/421b1d641caa1dc3e1a3453b2f51e0b15ae268c2

2872: Fix bugs
---

diff --git a/apps/workbench/app/models/virtual_machine.rb b/apps/workbench/app/models/virtual_machine.rb
index 705ab8c55e..839cd52493 100644
--- a/apps/workbench/app/models/virtual_machine.rb
+++ b/apps/workbench/app/models/virtual_machine.rb
@@ -7,7 +7,7 @@ class VirtualMachine < ArvadosBase
     super.append ['current_user_logins', @current_user_logins]
   end
   def attribute_editable? attr, *args
-    attr != 'current_user_logins' and super *args
+    attr != 'current_user_logins' and super(attr, *args)
   end
   def self.attribute_info
     merger = ->(k,a,b) { a.merge(b, &merger) }
diff --git a/apps/workbench/app/views/folders/_index_jobs_and_pipelines.html.erb b/apps/workbench/app/views/folders/_index_jobs_and_pipelines.html.erb
index 44f4f9579f..fb637c6e25 100644
--- a/apps/workbench/app/views/folders/_index_jobs_and_pipelines.html.erb
+++ b/apps/workbench/app/views/folders/_index_jobs_and_pipelines.html.erb
@@ -1,4 +1,5 @@
 <div class="container-fluid">
+  <% any = false %>
   <% recent_jobs_and_pipelines[0..9].each do |object| %>
     <% any = true %>
     <div class="row">
@@ -19,7 +20,7 @@
       </div>
     </div>
   <% end %>
-  <% if not defined? any %>
+  <% if not any %>
     <span class="deemphasize">No jobs or pipelines to display.</span>
   <% end %>
 </div>