Permalink
Browse files

Merge pull request #818 from sarken/issue_2183

Modify fix for issue 2183 by adding missing Join buttons on blurbs
  • Loading branch information...
2 parents 48e3775 + 8f88c97 commit a73e5f8046f860182a22682b7235eae1508fb999 @elzj elzj committed Aug 27, 2012
Showing with 4 additions and 1 deletion.
  1. +4 −1 app/views/collections/_collection_blurb.html.erb
@@ -59,7 +59,7 @@
<% end %><!-- end cache -->
- <% if collection.user_is_owner?(current_user) || (collection.challenge && collection.challenge.signup_open && logged_in?) %>
+ <% if collection.user_is_owner?(current_user) || (collection.challenge && collection.challenge.signup_open && logged_in?) || (collection.moderated? && logged_in?) %>
<h6 class="landmark heading"><%= ts("User Actions") %></h6>
<ul class="navigation actions" role="menu">
<% if collection.user_is_owner?(current_user) %>
@@ -68,6 +68,9 @@
<% if collection.challenge && collection.challenge.signup_open && logged_in? %>
<%= render "challenge/#{challenge_class_name(collection)}/challenge_navigation_user", :collection => collection %>
<% end %>
+ <% if !collection.user_is_owner?(current_user) && collection.moderated? && !(collection.challenge && collection.challenge.signup_open) %>
+ <li><%= link_to ts("Join"), join_collection_participants_path(collection) %></li>
+ <% end %>
</ul>
<% end %>
</li>

0 comments on commit a73e5f8

Please sign in to comment.