noticed a few more broken things on exchange maintainer pages. gee thanks ao3
This commit is contained in:
parent
b02c9cb01f
commit
1e3ee73118
3 changed files with 13 additions and 21 deletions
|
|
@ -52,12 +52,10 @@
|
||||||
<% unless assignment.fulfilled? %>
|
<% unless assignment.fulfilled? %>
|
||||||
<ul class="actions" role="menu">
|
<ul class="actions" role="menu">
|
||||||
<% if @user && @user == current_user %>
|
<% if @user && @user == current_user %>
|
||||||
<li><%= link_to t("challenge_assignments.to_fulfill.button"), new_collection_work_path(assignment.collection, assignment_id: assignment.id) %></li>
|
<li> <li><%= link_to ts("Fulfill"), new_collection_work_path(assignment.collection, :assignment_id => assignment.id) %></li>
|
||||||
<li>
|
<li role="button">
|
||||||
<%= button_to t("challenge_assignments.to_default.button"),
|
<%= link_to ts("Default"), default_collection_assignment_path(assignment.collection, assignment),
|
||||||
default_collection_assignment_path(assignment.collection, assignment),
|
data: {confirm: ts("Are you sure? This will mark you as having defaulted and notify the collection maintainer! It cannot be undone.")} %>
|
||||||
data: { confirm: t("challenge_assignments.to_default.confirmation") },
|
|
||||||
method: :patch %>
|
|
||||||
</li>
|
</li>
|
||||||
<% elsif @collection && @collection.user_is_maintainer?(current_user) %>
|
<% elsif @collection && @collection.user_is_maintainer?(current_user) %>
|
||||||
<%= fields_for "challenge_assignments[]", assignment do |assignment_form| %>
|
<%= fields_for "challenge_assignments[]", assignment do |assignment_form| %>
|
||||||
|
|
|
||||||
|
|
@ -30,10 +30,10 @@
|
||||||
collection_assignments_path(@collection, fulfilled: true) %>
|
collection_assignments_path(@collection, fulfilled: true) %>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<%= button_to ts("Default All Incomplete"),
|
<%= link_to ts("Default All Incomplete"),
|
||||||
default_all_collection_assignments_path(@collection),
|
default_all_collection_assignments_path(@collection),
|
||||||
data: { confirm: ts("Are you sure? This will mark all unposted or unapproved assignments in the challenge as defaulting.") },
|
data: { confirm: ts("Are you sure? This will mark all unposted or unapproved assignments in the challenge as defaulting.") },
|
||||||
method: :patch %>
|
role: "button" %>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<%= link_to ts("Purge Assignments"),
|
<%= link_to ts("Purge Assignments"),
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<% # accessed through My Assignment on challenge dashboard %>
|
<% # accessed txhrough My Assignment on challenge dashboard %>
|
||||||
<!--Descriptive page name, messages and instructions-->
|
<!--Descriptive page name, messages and instructions-->
|
||||||
<h2 class="heading"><%= ts("Assignment for") %> <%= @challenge_assignment.offer_byline %> <% if @challenge_assignment.collection.challenge.user_allowed_to_see_assignments?(current_user) %><%= challenge_assignment_email(@challenge_assignment) %><% end %></h2>
|
<h2 class="heading"><%= ts("Assignment for") %> <%= @challenge_assignment.offer_byline %> <% if @challenge_assignment.collection.challenge.user_allowed_to_see_assignments?(current_user) %><%= challenge_assignment_email(@challenge_assignment) %><% end %></h2>
|
||||||
<!--/descriptions-->
|
<!--/descriptions-->
|
||||||
|
|
@ -10,26 +10,20 @@
|
||||||
<% if @challenge_assignment.defaulted? %>
|
<% if @challenge_assignment.defaulted? %>
|
||||||
<span class="defaulted"><%= ts("Defaulted") %></span>
|
<span class="defaulted"><%= ts("Defaulted") %></span>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= button_to t("challenge_assignments.to_default.button"),
|
<%= link_to ts("Default"), default_collection_assignment_path(@challenge_assignment.collection, @challenge_assignment),
|
||||||
default_collection_assignment_path(@challenge_assignment.collection, @challenge_assignment),
|
data: {confirm: ts("Are you sure? This will mark you as having defaulted and notify the collection maintainer! It cannot be undone.")} %>
|
||||||
data: { confirm: t("challenge_assignments.to_default.confirmation") },
|
|
||||||
method: :patch %>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
</li>
|
</li>
|
||||||
<li><%= link_to t("challenge_assignments.to_fulfill.button"),
|
<li><%= link_to ts("Fulfill"), new_collection_work_path(@challenge_assignment.collection, :assignment_id => @challenge_assignment.id) %></li>
|
||||||
new_collection_work_path(
|
|
||||||
@challenge_assignment.collection,
|
|
||||||
assignment_id: @challenge_assignment.id
|
|
||||||
) %>
|
|
||||||
</li>
|
|
||||||
</ul>
|
</ul>
|
||||||
<% end %>
|
<% end %>
|
||||||
<!--/subnav-->
|
<!--/subnav-->
|
||||||
|
|
||||||
<!--main content-->
|
<!--main content-->
|
||||||
|
<% request = (@challenge_assignment.request_signup || @challenge_assignment.pinch_request_signup) %>
|
||||||
|
|
||||||
<% if @challenge_assignment.request_signup %>
|
<% if request %>
|
||||||
<%= render "challenge_signups/show_requests", challenge_signup: @challenge_assignment.request_signup %>
|
<%= render "challenge_signups/show_requests", :challenge_signup => request %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<h3 class="heading"><%= ts("No request!") %></h3>
|
<h3 class="heading"><%= ts("No request!") %></h3>
|
||||||
<p class="note"><%= ts("Contact challenge moderators for help.") %></p>
|
<p class="note"><%= ts("Contact challenge moderators for help.") %></p>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue