resolve confilts

This commit is contained in:
yqbk
2016-05-12 18:45:14 +02:00
parent a2e1b08730
commit d26d859df1
3 changed files with 4 additions and 4 deletions

View File

@@ -23,13 +23,13 @@ h1
h2 = t('activerecord.attributes.exercise.files')
ul.list-unstyled.panel-group#files
- @exercise.files.order('name').each do |file|
- @exercise.files.each do |file|
li.panel.panel-default
.panel-heading role="tab" id="heading"
div.clearfix role="button"
span.panel-title = file.name_with_extension
a.pull-right data-toggle="collapse" data-parent="#files" href="#collapse#{file.id}" collapse
.panel-collapse.collapse id="collapse#{file.id}" role="tabpanel"
.panel-collapse.collapse.in id="collapse#{file.id}" role="tabpanel"
.panel-body
- if policy(file).destroy?
.clearfix = link_to(t('shared.destroy'), file, class:'btn btn-warning btn-sm pull-right', data: {confirm: t('shared.confirm_destroy')}, method: :delete)