# HG changeset patch # User Nattee Niparnan # Date 2021-08-09 17:40:20 # Node ID daf5f8de8a3fcc78d4cd2f71a6ec17288162ee34 # Parent 509b8db382d421111ac82a8e906b950892fe7ca6 fix wrong merge on user diff --git a/app/models/user.rb b/app/models/user.rb --- a/app/models/user.rb +++ b/app/models/user.rb @@ -88,6 +88,10 @@ end end + def login_with_name + "[#{login}] #{full_name}" + end + def authenticated_by_cucas?(password) url = URI.parse('https://www.cas.chula.ac.th/cas/api/?q=studentAuthenticate') appid = '41508763e340d5858c00f8c1a0f5a2bb'