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

Merge pull request #211 from openHPI/fl/test-file-order

Browse Source 
Order files by name by default
This commit is contained in:
rteusner
2018-10-02 17:04:52 +02:00
committed by GitHub
parent 29227cbe14 4e6d7f8b8a
commit 582dff9e08
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/code_ocean/file.rb
View File

@ -47,6 +47,8 @@ module CodeOcean
scope :"#{role}s", -> { where(role: role) } scope :"#{role}s", -> { where(role: role) }
end end
default_scope { order(name: :asc) }
validates :feedback_message, if: :teacher_defined_test?, presence: true validates :feedback_message, if: :teacher_defined_test?, presence: true
validates :feedback_message, absence: true, unless: :teacher_defined_test? validates :feedback_message, absence: true, unless: :teacher_defined_test?
validates :file_type_id, presence: true validates :file_type_id, presence: true

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

@ -25,7 +25,7 @@ h1
h2 = t('activerecord.attributes.exercise.files') h2 = t('activerecord.attributes.exercise.files')
ul.list-unstyled.panel-group#files ul.list-unstyled.panel-group#files
- @exercise.files.order('name').each do |file| - @exercise.files.each do |file|
li.panel.panel-default li.panel.panel-default
.panel-heading role="tab" id="heading" .panel-heading role="tab" id="heading"
a.file-heading data-toggle="collapse" data-parent="#files" href=".collapse#{file.id}" a.file-heading data-toggle="collapse" data-parent="#files" href=".collapse#{file.id}"