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/external_users/index.html.slim
View File

@@ -10,7 +10,7 @@ h1 = ExternalUser.model_name.human(count: 2)
tbody
- @users.each do |user|
tr
td = link_to_if(policy(user).show?, user.name)
td = link_to_if(policy(user).show?, user.displayname)
td = link_to_if(policy(user.consumer).show?, user.consumer, user.consumer)
td = link_to(t('shared.show'), user) if policy(user).show?

2
app/views/external_users/show.html.slim
View File

@@ -1,4 +1,4 @@
h1 = @user.name
h1 = @user.displayname
= row(label: 'external_user.name', value: @user.name)
//= row(label: 'external_user.email', value: @user.email)