diff options
Diffstat (limited to 'app/views/users/index.html.erb')
| -rw-r--r-- | app/views/users/index.html.erb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 883ffb0..95ab480 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,12 +1,16 @@ <h1> - <% if params[:role] %> + <% if params[:role] && !params[:badge]%> <%= title "All '#{params[:role]}' users" %> + <% elsif params[:badge] && !params[:role] %> + <%= title "All '#{params[:badge]}' users" %> + <% elsif params[:role] && params[:badge] %> + <%= title "All '#{params[:role]}' and '#{params[:badge]}' users" %> <% else %> <%= title "All Users" %> <% end %> (<%= @count %>) </h1> -<%= link_to "show all", users_path if params[:role] %> +<%= link_to "show all", users_path if params[:role] || params[:badge] %> <div id="userlist"> <% @users.each do |u| %> @@ -19,4 +23,4 @@ </div> <% end %> <%= paginate @users %> -</div>
\ No newline at end of file +</div> |