Merge pull request otwcode#125 from cesy/otwarchive

--- Issue 2332 - add links to My Signups page direct to edit http://code.google.com/p/otwarchive/issues/detail?id=2332
velocitygrass · May 27, 2011 · 71fcf16 · 71fcf16
2 parents 9097411 + f9c6c3e
commit 71fcf16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/views/challenge_signups/_signup_controls.html.erb b/app/views/challenge_signups/_signup_controls.html.erb
@@ -1,8 +1,8 @@
 <!-- requires 'challenge_signup' local -->
 <% if challenge_signup.collection.challenge.signup_open || (!challenge_signup.collection.challenge.signup_open && challenge_signup.collection.user_is_owner?(current_user)) || challenge_signup.collection.challenge_type == "PromptMeme" %>
   <ul class="navigation" role="navigation">
-    <!-- The edit and delete links shouldn't show on the index for a prompt meme -->
-    <% unless (controller.action_name == "index" && challenge_signup.collection.challenge_type == "PromptMeme") %>
+    <!-- The edit and delete links shouldn't show on the collection index for a prompt meme -->
+    <% unless (controller.action_name == "index" && challenge_signup.collection.challenge_type == "PromptMeme" && !@user) %>
     <!-- The edit link should show up only for the user who actually signed up while signups are open or for the owner once signups are closed -->
     <% if (challenge_signup.collection.challenge.signup_open && challenge_signup.pseud.user == current_user) || (!challenge_signup.collection.challenge.signup_open && challenge_signup.collection.user_is_owner?(current_user))  %>
       <li>

diff --git a/features/challenge_promptmeme.feature b/features/challenge_promptmeme.feature
@@ -72,6 +72,8 @@ Feature: Prompt Meme Challenge
   Then I should see "My Signups (1)"
   When I follow "My Signups (1)"
   Then I should see "Battle 12"
+    And I should see "Edit"
+    And I should see "Delete"
 
   Scenario: Sort prompts by date