merge master
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
- if current_user.admin?
|
||||
li = link_to(t('breadcrumbs.dashboard.show'), admin_dashboard_path)
|
||||
li.divider
|
||||
- models = [ExecutionEnvironment, Exercise, Consumer, CodeHarborLink, ExternalUser, FileType, InternalUser, Submission, Team].sort_by { |model| model.model_name.human(count: 2) }
|
||||
- models = [ExecutionEnvironment, Exercise, Consumer, CodeHarborLink, ExternalUser, FileType, InternalUser, Submission].sort_by { |model| model.model_name.human(count: 2) }
|
||||
- models.each do |model|
|
||||
- if policy(model).index?
|
||||
li = link_to(model.model_name.human(count: 2), send(:"#{model.model_name.collection}_path"))
|
||||
|
@@ -17,9 +17,6 @@
|
||||
= f.label(:instructions)
|
||||
= f.hidden_field(:instructions)
|
||||
.form-control.markdown
|
||||
/.form-group
|
||||
= f.label(:team_id)
|
||||
= f.collection_select(:team_id, @teams, :id, :name, {include_blank: true}, class: 'form-control')
|
||||
.checkbox
|
||||
label
|
||||
= f.check_box(:public)
|
||||
|
@@ -50,9 +50,9 @@ h1 = "#{@exercise} (external user #{@external_user})"
|
||||
td
|
||||
-submission.testruns.each do |run|
|
||||
- if run.passed
|
||||
.unit-test-result.positive-result
|
||||
.unit-test-result.positive-result title=run.output
|
||||
- else
|
||||
.unit-test-result.negative-result
|
||||
.unit-test-result.negative-result title=run.output
|
||||
td = Time.at(deltas[1..index].inject(:+)).utc.strftime("%H:%M:%S") if index > 0
|
||||
-working_times_until.push((Time.at(deltas[1..index].inject(:+)).utc.strftime("%H:%M:%S") if index > 0))
|
||||
p = t('.addendum')
|
||||
|
@@ -12,7 +12,6 @@ h1
|
||||
= row(label: 'exercise.description', value: render_markdown(@exercise.description))
|
||||
= row(label: 'exercise.execution_environment', value: link_to_if(policy(@exercise.execution_environment).show?, @exercise.execution_environment, @exercise.execution_environment))
|
||||
/= row(label: 'exercise.instructions', value: render_markdown(@exercise.instructions))
|
||||
= row(label: 'exercise.team', value: @exercise.team ? link_to(@exercise.team, @exercise.team) : nil)
|
||||
= row(label: 'exercise.maximum_score', value: @exercise.maximum_score)
|
||||
= row(label: 'exercise.public', value: @exercise.public?)
|
||||
= row(label: 'exercise.hide_file_tree', value: @exercise.hide_file_tree?)
|
||||
|
@@ -1,9 +0,0 @@
|
||||
= form_for(@team) do |f|
|
||||
= render('shared/form_errors', object: @team)
|
||||
.form-group
|
||||
= f.label(:name)
|
||||
= f.text_field(:name, class: 'form-control', required: true)
|
||||
.form-group
|
||||
= f.label(:internal_user_ids)
|
||||
= f.collection_select(:internal_user_ids, InternalUser.all.order(:name), :id, :name, {}, {class: 'form-control', multiple: true})
|
||||
.actions = render('shared/submit_button', f: f, object: @team)
|
@@ -1,3 +0,0 @@
|
||||
h1 = @hint
|
||||
|
||||
= render('form')
|
@@ -1,20 +0,0 @@
|
||||
h1 = Team.model_name.human(count: 2)
|
||||
|
||||
.table-responsive
|
||||
table.table
|
||||
thead
|
||||
tr
|
||||
th = t('activerecord.attributes.team.name')
|
||||
th = t('activerecord.attributes.team.internal_user_ids')
|
||||
th colspan=3 = t('shared.actions')
|
||||
tbody
|
||||
- @teams.each do |team|
|
||||
tr
|
||||
td = team.name
|
||||
td = team.members.count
|
||||
td = link_to(t('shared.show'), team_path(team.id))
|
||||
td = link_to(t('shared.edit'), edit_team_path(team.id))
|
||||
td = link_to(t('shared.destroy'), team_path(team.id), data: {confirm: t('shared.confirm_destroy')}, method: :delete)
|
||||
|
||||
= render('shared/pagination', collection: @teams)
|
||||
p = render('shared/new_button', model: Team, path: new_team_path)
|
@@ -1,3 +0,0 @@
|
||||
h1 = t('shared.new_model', model: Team.model_name.human)
|
||||
|
||||
= render('form')
|
@@ -1,9 +0,0 @@
|
||||
h1
|
||||
= @team
|
||||
= render('shared/edit_button', object: @team, path: edit_team_path(@team.id))
|
||||
|
||||
= row(label: 'team.name', value: @team.name)
|
||||
= row(label: 'team.internal_user_ids') do
|
||||
ul.list-unstyled
|
||||
- @team.members.order(:name).each do |internal_user|
|
||||
li = link_to(internal_user, internal_user)
|
Reference in New Issue
Block a user