projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 4523-search-index
[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 1138bd2b9b4f8412336e3c9f41dd23355dbf460c..fc463378f6833550467f2bb754d072b309b71845 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
@@
-54,8
+60,14
@@
class ArvadosModel < ActiveRecord::Base
textonly_operator = !operator.match(/[<=>]/)
self.columns.select do |col|
case col.type
textonly_operator = !operator.match(/[<=>]/)
self.columns.select do |col|
case col.type
- when :string
, :text
+ when :string
true
true
+ when :text
+ if operator == 'ilike'
+ false
+ else
+ true
+ end
when :datetime, :integer, :boolean
!textonly_operator
else
when :datetime, :integer, :boolean
!textonly_operator
else
@@
-104,7
+116,8
@@
class ArvadosModel < ActiveRecord::Base
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]
@@
-198,13
+211,6
@@
class ArvadosModel < ActiveRecord::Base
attributes
end
attributes
end
- def has_permission? perm_type, target_uuid
- Link.where(link_class: "permission",
- name: perm_type,
- tail_uuid: uuid,
- head_uuid: target_uuid).any?
- end
-
protected
def ensure_ownership_path_leads_to_user
protected
def ensure_ownership_path_leads_to_user
@@
-445,6
+451,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]
@@
-527,7
+537,6
@@
class ArvadosModel < ActiveRecord::Base
log = Log.new(event_type: event_type).fill_object(self)
yield log
log.save!
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