X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/55f5486de7676b8906066b290ed0420b19f90eda..c8bea0c6dd47a9b9a7a892602d9869177d4c231f:/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 3599cacb01..b02db7a6b6 100644
--- a/apps/workbench/app/models/arvados_base.rb
+++ b/apps/workbench/app/models/arvados_base.rb
@@ -53,6 +53,7 @@ class ArvadosBase < ActiveRecord::Base
       'modified_by_client_uuid' => '203',
       'uuid' => '999',
     }
+    @loaded_attributes = {}
   end
 
   def self.columns
@@ -74,6 +75,14 @@ class ArvadosBase < ActiveRecord::Base
           @columns << column(k, :text)
           serialize k, coldef[:type].constantize
         end
+        define_method k do
+          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()
+        end
         @attribute_info[k] = coldef
       end
     end
@@ -171,8 +180,14 @@ class ArvadosBase < ActiveRecord::Base
   def save
     obdata = {}
     self.class.columns.each do |col|
+      # Non-nil serialized values must be sent because we can't tell
+      # whether they've changed. Other than that, any given attribute
+      # is either unchanged (in which case there's no need to send its
+      # old value in the update/create command) or has been added to
+      # #changed by ActiveRecord's #attr= method.
       if changed.include? col.name or
-          self.class.serialized_attributes.include? col.name
+          (self.class.serialized_attributes.include? col.name and
+           @loaded_attributes[col.name])
         obdata[col.name.to_sym] = self.send col.name
       end
     end
@@ -199,8 +214,8 @@ class ArvadosBase < ActiveRecord::Base
       end
     end
 
-    @new_record = false
     changes_applied
+    @new_record = false
 
     self
   end
@@ -268,6 +283,7 @@ class ArvadosBase < ActiveRecord::Base
       hash = arvados_api_client.api(self.class, '/' + uuid_or_hash)
     end
     hash.each do |k,v|
+      @loaded_attributes[k.to_s] = true
       if self.respond_to?(k.to_s + '=')
         self.send(k.to_s + '=', v)
       else
@@ -282,8 +298,8 @@ class ArvadosBase < ActiveRecord::Base
       end
     end
     @all_links = nil
-    @new_record = false
     changes_applied
+    @new_record = false
     self
   end
 
@@ -341,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