[ARVADOS] updated: d06ffd22147b4f3df211388fb2f2a21fbb8ac7ac
git at public.curoverse.com
git at public.curoverse.com
Tue Jun 2 15:24:01 EDT 2015
Summary of changes:
apps/workbench/app/models/arvados_base.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
discards a64718801b50797c9af35da3e78255463f4dae1d (commit)
via d06ffd22147b4f3df211388fb2f2a21fbb8ac7ac (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (a64718801b50797c9af35da3e78255463f4dae1d)
\
N -- N -- N (d06ffd22147b4f3df211388fb2f2a21fbb8ac7ac)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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 d06ffd22147b4f3df211388fb2f2a21fbb8ac7ac
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Jun 2 15:23:51 2015 -0400
6087: Reset changed-attrs list after saving. Fix only-send-changed-attrs logic.
diff --git a/apps/workbench/app/models/arvados_base.rb b/apps/workbench/app/models/arvados_base.rb
index 2fca11e..af66678 100644
--- a/apps/workbench/app/models/arvados_base.rb
+++ b/apps/workbench/app/models/arvados_base.rb
@@ -171,8 +171,8 @@ class ArvadosBase < ActiveRecord::Base
def save
obdata = {}
self.class.columns.each do |col|
- unless self.send(col.name.to_sym).nil? and !self.changed.include?(col.name)
- obdata[col.name.to_sym] = self.send(col.name.to_sym)
+ if changed.include? col.name
+ obdata[col.name.to_sym] = self.send(col.name.to_sym)
end
end
obdata.delete :id
@@ -199,6 +199,7 @@ class ArvadosBase < ActiveRecord::Base
end
@new_record = false
+ changes_applied
self
end
@@ -281,6 +282,7 @@ class ArvadosBase < ActiveRecord::Base
end
@all_links = nil
@new_record = false
+ changes_applied
self
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list