projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Arvbox sets PATH, GEM_HOME and GEM_PATH in common.sh. refs #10410
[arvados.git]
/
services
/
api
/
app
/
models
/
api_client_authorization.rb
diff --git
a/services/api/app/models/api_client_authorization.rb
b/services/api/app/models/api_client_authorization.rb
index b9442d64e78bf888741e9e47d532f53d73059e22..f7985a986afa304806cac1a551c1603615e92196 100644
(file)
--- a/
services/api/app/models/api_client_authorization.rb
+++ b/
services/api/app/models/api_client_authorization.rb
@@
-1,4
+1,5
@@
class ApiClientAuthorization < ArvadosModel
class ApiClientAuthorization < ArvadosModel
+ include HasUuid
include KindAndEtag
include CommonApiTemplate
include KindAndEtag
include CommonApiTemplate
@@
-36,17
+37,6
@@
class ApiClientAuthorization < ArvadosModel
self.user_id_changed?
end
self.user_id_changed?
end
- def uuid
- self.api_token
- end
- def uuid=(x) end
- def uuid_was
- self.api_token_was
- end
- def uuid_changed?
- self.api_token_changed?
- end
-
def modified_by_client_uuid
nil
end
def modified_by_client_uuid
nil
end
@@
-75,9
+65,7
@@
class ApiClientAuthorization < ArvadosModel
end
def logged_attributes
end
def logged_attributes
- attrs = attributes.dup
- attrs.delete('api_token')
- attrs
+ super.except 'api_token'
end
def self.default_orders
end
def self.default_orders
@@
-92,8
+80,9
@@
class ApiClientAuthorization < ArvadosModel
def permission_to_update
(permission_to_create and
def permission_to_update
(permission_to_create and
- not self.user_id_changed? and
- not self.owner_uuid_changed?)
+ not uuid_changed? and
+ not user_id_changed? and
+ not owner_uuid_changed?)
end
def log_update
end
def log_update