Merge branch '6941-docs-fix-www-data' closes #6941

[arvados.git] / apps / workbench / app / models / arvados_base.rb

diff --git a/apps/workbench/app/models/arvados_base.rb b/apps/workbench/app/models/arvados_base.rb
index c08d7475a723b710c684ff571a949ddbcd37e8af..b02db7a6b63b5fad8c75ea5f107baa74a58d7151 100644 (file)
--- a/apps/workbench/app/models/arvados_base.rb
+++ b/apps/workbench/app/models/arvados_base.rb
@@ -76,10 +76,12 @@ class ArvadosBase < ActiveRecord::Base
           serialize k, coldef[:type].constantize
         end
         define_method k do
-          unless new_record? or @loaded_attributes.include? k
-            raise ActiveModel::MissingAttributeError, "missing attribute: #{k}"
+          unless new_record? or @loaded_attributes.include? k.to_s
+            Rails.logger.debug "BUG: access non-loaded attribute #{k}"
+            # We should...
+            # raise ActiveModel::MissingAttributeError, "missing attribute: #{k}"
           end
-          super
+          super()
         end
         @attribute_info[k] = coldef
       end
@@ -212,8 +214,8 @@ class ArvadosBase < ActiveRecord::Base
       end
     end
 
-    @new_record = false
     changes_applied
+    @new_record = false
 
     self
   end
@@ -296,8 +298,8 @@ class ArvadosBase < ActiveRecord::Base
       end
     end
     @all_links = nil
-    @new_record = false
     changes_applied
+    @new_record = false
     self
   end
 
@@ -355,6 +357,10 @@ class ArvadosBase < ActiveRecord::Base
        (ArvadosBase.find(owner_uuid).writable_by.include? current_user.uuid rescue false)))) or false
   end
 
+  def deletable?
+    editable?
+  end
+
   # Array of strings that are the names of attributes that can be edited
   # with X-Editable.
   def editable_attributes