projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo.
[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 376df0cef3cd9aea812bcdf1a92fff92b76f8952..5f9c014bbdda7676874268225704fb975868f3de 100644
(file)
--- a/
services/api/app/models/arvados_model.rb
+++ b/
services/api/app/models/arvados_model.rb
@@
-36,6
+36,12
@@
class ArvadosModel < ActiveRecord::Base
end
end
end
end
+ class AlreadyLockedError < StandardError
+ def http_status
+ 403
+ end
+ end
+
class UnauthorizedError < StandardError
def http_status
401
class UnauthorizedError < StandardError
def http_status
401
@@
-50,6
+56,12
@@
class ArvadosModel < ActiveRecord::Base
"#{current_api_base}/#{self.class.to_s.pluralize.underscore}/#{self.uuid}"
end
"#{current_api_base}/#{self.class.to_s.pluralize.underscore}/#{self.uuid}"
end
+ def self.selectable_attributes(template=:user)
+ # Return an array of attribute name strings that can be selected
+ # in the given template.
+ api_accessible_attributes(template).map { |attr_spec| attr_spec.first.to_s }
+ end
+
def self.searchable_columns operator
textonly_operator = !operator.match(/[<=>]/)
self.columns.select do |col|
def self.searchable_columns operator
textonly_operator = !operator.match(/[<=>]/)
self.columns.select do |col|
@@
-101,10
+113,12
@@
class ArvadosModel < ActiveRecord::Base
# If current user cannot write this object, just return
# [self.owner_uuid].
def writable_by
# If current user cannot write this object, just return
# [self.owner_uuid].
def writable_by
+ return [owner_uuid] if not current_user
unless (owner_uuid == current_user.uuid or
current_user.is_admin or
(current_user.groups_i_can(:manage) & [uuid, owner_uuid]).any?)
unless (owner_uuid == current_user.uuid or
current_user.is_admin or
(current_user.groups_i_can(:manage) & [uuid, owner_uuid]).any?)
- if current_user.groups_i_can(:write).index(uuid)
+ if ((current_user.groups_i_can(:write) + [current_user.uuid]) &
+ [uuid, owner_uuid]).any?
return [owner_uuid, current_user.uuid]
else
return [owner_uuid]
return [owner_uuid, current_user.uuid]
else
return [owner_uuid]
@@
-425,6
+439,7
@@
class ArvadosModel < ActiveRecord::Base
def self.uuid_prefixes
unless @@prefixes_hash
@@prefixes_hash = {}
def self.uuid_prefixes
unless @@prefixes_hash
@@prefixes_hash = {}
+ Rails.application.eager_load!
ActiveRecord::Base.descendants.reject(&:abstract_class?).each do |k|
if k.respond_to?(:uuid_prefix)
@@prefixes_hash[k.uuid_prefix] = k
ActiveRecord::Base.descendants.reject(&:abstract_class?).each do |k|
if k.respond_to?(:uuid_prefix)
@@prefixes_hash[k.uuid_prefix] = k
@@
-438,6
+453,10
@@
class ArvadosModel < ActiveRecord::Base
"_____-#{uuid_prefix}-_______________"
end
"_____-#{uuid_prefix}-_______________"
end
+ def self.uuid_regex
+ %r/[a-z0-9]{5}-#{uuid_prefix}-[a-z0-9]{15}/
+ end
+
def ensure_valid_uuids
specials = [system_user_uuid]
def ensure_valid_uuids
specials = [system_user_uuid]
@@
-487,7
+506,6
@@
class ArvadosModel < ActiveRecord::Base
end
resource_class = nil
end
resource_class = nil
- Rails.application.eager_load!
uuid.match HasUuid::UUID_REGEX do |re|
return uuid_prefixes[re[1]] if uuid_prefixes[re[1]]
end
uuid.match HasUuid::UUID_REGEX do |re|
return uuid_prefixes[re[1]] if uuid_prefixes[re[1]]
end
@@
-512,15
+530,14
@@
class ArvadosModel < ActiveRecord::Base
end
def log_start_state
end
def log_start_state
- @old_
etag = etag
- @old_
attributes = logged_attributes
+ @old_
attributes = Marshal.load(Marshal.dump(attributes))
+ @old_
logged_attributes = Marshal.load(Marshal.dump(logged_attributes))
end
def log_change(event_type)
log = Log.new(event_type: event_type).fill_object(self)
yield log
log.save!
end
def log_change(event_type)
log = Log.new(event_type: event_type).fill_object(self)
yield log
log.save!
- connection.execute "NOTIFY logs, '#{log.id}'"
log_start_state
end
log_start_state
end
@@
-533,14
+550,14
@@
class ArvadosModel < ActiveRecord::Base
def log_update
log_change('update') do |log|
def log_update
log_change('update') do |log|
- log.fill_properties('old',
@old_etag, @ol
d_attributes)
+ log.fill_properties('old',
etag(@old_attributes), @old_logge
d_attributes)
log.update_to self
end
end
def log_destroy
log_change('destroy') do |log|
log.update_to self
end
end
def log_destroy
log_change('destroy') do |log|
- log.fill_properties('old',
@old_etag, @ol
d_attributes)
+ log.fill_properties('old',
etag(@old_attributes), @old_logge
d_attributes)
log.update_to nil
end
end
log.update_to nil
end
end