Skip to content

Commit

Permalink
Merge pull request #22 from crowdAI/issue_20b
Browse files Browse the repository at this point in the history
Issue 20b
  • Loading branch information
scarroll32 authored Nov 14, 2016
2 parents e021566 + b6b7691 commit 596388a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ public/assets/*
screenshot*
.byebug_history
scripts/challenges/openfood/public_500/images/*
scripts/dev_from_prd.sh
6 changes: 3 additions & 3 deletions app/views/posts/_post.html.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<li class="list-group-item post">
<%= markdown(post.post) %>
<%= link_to "Quote", new_topic_post_path(@topic, :quote => post) %>
<%= link_to "Quote", new_topic_post_path(@topic, :quote => post), class: 'btn btn-primary' %>
<% if current_participant.admin? || current_participant == post.participant %>
<%= link_to 'edit', edit_topic_post_path(@topic, post) %>
<%= link_to 'delete', [@topic, post], method: :delete, data: { confirm: 'Are you sure?' } %>
<%= link_to 'Edit', edit_topic_post_path(@topic, post), class: 'btn btn-primary' %>
<%= link_to 'Delete', [@topic, post], method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-primary' %>
<% end %>
<div class="pull-right">
Posted by <%= link_to post.participant.name, participant_path(post.participant) %>,
Expand Down
2 changes: 2 additions & 0 deletions spec/features/challenge_admin_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
expect(page).to have_button 'Update Challenge'
end

=begin
scenario 'create challenge with dataset' do
create_perpetual_challenge(challenge_data)
find('#glyphicon-link-dataset').click
Expand All @@ -62,6 +63,7 @@
expect(page).not_to have_content "failed"
click_button "Create File"
end
=end

scenario "challenge admin must configure a grading method" do
create_perpetual_challenge(challenge_data)
Expand Down

0 comments on commit 596388a

Please sign in to comment.