htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into add_roles_via_LTI

Browse Source 
# Conflicts:
#	app/views/application/_breadcrumbs.html.slim
#	app/views/application/welcome.html.slim
#	app/views/exercise_collections/show.html.slim
#	app/views/external_users/index.html.slim
#	app/views/layouts/application.html.slim
#	app/views/proxy_exercises/index.html.slim
#	app/views/user_exercise_feedbacks/index.html.slim
#	app/views/user_mailer/send_thank_you_note.slim
This commit is contained in:
Sebastian Serth
2018-12-14 00:53:06 +01:00
parent 3665058435 6c46566174
commit 1a26d67c82
47 changed files with 256 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/application/welcome.html.slim
View File

@ -1,7 +1,7 @@
h1 = t('.title', application_name: application_name)
- if current_user.try(:admin?) or current_user.try(:teacher?)
p = t('.text_signed_in_as_internal_user', user_name: current_user.name)
p = t('.text_signed_in_as_internal_user', user_name: current_user.displayname)
- elsif current_user.try(:external_user?)
p = t('.text_signed_in_as_external_user', application_name: application_name)
- else