Show the register link everywhere it's needed #979

Contributed by Harald Klimach
This commit is contained in:
Felix Schäfer 2012-07-09 18:06:32 +02:00 committed by Kolan Sh
parent 03e68da23c
commit f0f0171a59
2 changed files with 12 additions and 3 deletions

View File

@ -39,8 +39,8 @@
<%= render :partial => 'search/quick_search', :locals => {:search_term => @question} %>
</div>
<% if User.current.logged? || !Setting.login_required? %>
<ul id="account-nav">
<% if User.current.logged? || !Setting.login_required? %>
<% main_top_menu_items.each do |item| %>
<%= render_menu_node(item) %>
<% end %>
@ -75,7 +75,8 @@
</ul>
</li>
<% end %>
<%= render_menu_node(help_menu_item) %>
<%= render_menu_node(help_menu_item) %>
<% end %>
<% unless User.current.logged? %>
<% if Setting.self_registration? %>
<li>
@ -99,7 +100,6 @@
</li>
<% end %>
</ul>
<% end %>
</div>
</div>
<div id="breadcrumb">

View File

@ -101,6 +101,15 @@ class AccountTest < ActionController::IntegrationTest
assert_equal 0, Token.count
end
def test_self_register_link_present
Setting.self_registration = '3'
Setting.login_required = '1'
get "/"
follow_redirect!
assert_select "a[href*=?]", "/account/register", :text => "Register"
end
def test_register_with_automatic_activation
Setting.self_registration = '3'