Skip to content

O
OHR Support
Commit 12b2d3c1 authored by Felix Schäfer's avatar Felix Schäfer
Browse files
Options

Show the register link everywhere it's needed #979 

Contributed by Harald Klimach
parent 37c762b9
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 3 deletions
app/views/layouts/base.rhtml
View file @ 12b2d3c1
......@@ -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">
......
test/integration/account_test.rb
View file @ 12b2d3c1
......@@ -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'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment