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

@@ -18,7 +18,7 @@ h1 = UserExerciseFeedback.model_name.human(count: 2)
tbody
- @uefs.each do |uef|
tr
td = link_to_if(policy(uef.user).show?, uef.user.name)
td = link_to_if(policy(uef.user).show?, uef.user.displayname)
td = link_to_if(policy(uef.exercise).show?, uef.exercise.title, uef.exercise)
td = link_to(t('shared.show'), uef) if policy(uef).show?
td = link_to(t('shared.destroy'), uef, data: {confirm: t('shared.confirm_destroy')}, method: :delete) if policy(uef).destroy?