projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 10293-cwl-cr-output
[arvados.git]
/
services
/
api
/
app
/
models
/
arvados_model.rb
diff --git
a/services/api/app/models/arvados_model.rb
b/services/api/app/models/arvados_model.rb
index 7d1c30cdaf63b418086a265c5129a103d168cb67..18d5647cc929e760a72ed48ed709a9d18b8da8a3 100644
(file)
--- a/
services/api/app/models/arvados_model.rb
+++ b/
services/api/app/models/arvados_model.rb
@@
-530,7
+530,7
@@
class ArvadosModel < ActiveRecord::Base
end
def self.uuid_like_pattern
end
def self.uuid_like_pattern
- "
_____
-#{uuid_prefix}-_______________"
+ "
#{Rails.configuration.uuid_prefix}
-#{uuid_prefix}-_______________"
end
def self.uuid_regex
end
def self.uuid_regex
@@
-636,7
+636,7
@@
class ArvadosModel < ActiveRecord::Base
end
def log_destroy
end
def log_destroy
- log_change('de
stroy
') do |log|
+ log_change('de
lete
') do |log|
log.fill_properties('old', etag(@old_attributes), @old_logged_attributes)
log.update_to nil
end
log.fill_properties('old', etag(@old_attributes), @old_logged_attributes)
log.update_to nil
end