Merge pull request #3143 from Undev/state-machine-3

State machine 3
2013-03-05 05:38:16 -08:00 · 2013-03-05 05:38:16 -08:00 · f22488f726
commit f22488f726
parent f9200e118c c6d6bd6ab4
15 changed files with 68 additions and 33 deletions
--- a/app/views/teams/members/_show.html.haml
+++ b/app/views/teams/members/_show.html.haml
@ -23,7 +23,7 @@
        %span.btn.disabled This is you!
      - if @team.owner == user
        %span.btn.disabled Owner
-      - elsif user.blocked
+      - elsif user.blocked?
        %span.btn.disabled.blocked Blocked
      - elsif allow_admin
        = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "btn-tiny btn btn-remove", title: "Remove from team" do