[ARVADOS] updated: 421b1d641caa1dc3e1a3453b2f51e0b15ae268c2

git at public.curoverse.com git at public.curoverse.com
Mon Jun 2 11:07:57 EDT 2014


Summary of changes:
 apps/workbench/app/models/virtual_machine.rb                        | 2 +-
 apps/workbench/app/views/folders/_index_jobs_and_pipelines.html.erb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

       via  421b1d641caa1dc3e1a3453b2f51e0b15ae268c2 (commit)
      from  92cb77cd08bbcc8ca0c0eab3aa5446efd43fb69f (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 421b1d641caa1dc3e1a3453b2f51e0b15ae268c2
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jun 2 11:07:47 2014 -0400

    2872: Fix bugs

diff --git a/apps/workbench/app/models/virtual_machine.rb b/apps/workbench/app/models/virtual_machine.rb
index 705ab8c..839cd52 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 44f4f95..fb637c6 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>

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list