projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2189-log-in-as-user'
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
user.rb
diff --git
a/apps/workbench/app/models/user.rb
b/apps/workbench/app/models/user.rb
index bc1f4763cc90ffa29dc7327b44cfefdd173df0fb..cc9b9bb058cea3e2696eaf37a85559fde93d1431 100644
(file)
--- a/
apps/workbench/app/models/user.rb
+++ b/
apps/workbench/app/models/user.rb
@@
-27,7
+27,15
@@
class User < ArvadosBase
{}))
end
{}))
end
- def attribute_editable?(attr)
+ def attributes_for_display
+ super.reject { |k,v| %w(owner_uuid default_owner_uuid identity_url prefs).index k }
+ end
+
+ def attribute_editable?(attr)
(not (self.uuid.andand.match(/000000000000000$/) and self.is_admin)) and super(attr)
end
(not (self.uuid.andand.match(/000000000000000$/) and self.is_admin)) and super(attr)
end
+
+ def friendly_link_name
+ [self.first_name, self.last_name].compact.join ' '
+ end
end
end