IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: grant admin on subfolder

Browse Source
This commit is contained in:
Neil Lalonde 2017-10-27 16:46:02 -04:00
parent bbf48d395e
commit bf00ab5d4a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/admin_confirmation_mailer.rb
View File

@ -8,7 +8,7 @@ class AdminConfirmationMailer < ActionMailer::Base
to_address, to_address,
template: 'admin_confirmation_mailer', template: 'admin_confirmation_mailer',
target_username: target_username, target_username: target_username,
admin_confirm_url: confirm_admin_url(token: token, host: Discourse.base_url_no_prefix) admin_confirm_url: confirm_admin_url(token: token, host: Discourse.base_url)
) )
end end
end end

2
app/views/users/confirm_admin.html.erb
View File

@ -14,7 +14,7 @@
<%=raw (t('activation.admin_confirm.complete', target_username: @confirmation.target_user.username)) %> <%=raw (t('activation.admin_confirm.complete', target_username: @confirmation.target_user.username)) %>
<br/> <br/>
<br/> <br/>
<%= link_to t("activation.admin_confirm.back_to", title: SiteSetting.title), "/", class: 'btn btn-primary' %> <%= link_to t("activation.admin_confirm.back_to", title: SiteSetting.title), Discourse.base_url, class: 'btn btn-primary' %>
<% end %> <% end %>
</div> </div>