Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-28 21:08:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix #1350 by removing admin_email from preferences model and add it as a site option in

Browse source 
site.yml.tmpl. This one needs running migrations
This commit is contained in:
Reinier Balt 2012-12-23 21:03:37 +01:00
parent a32f928fc8
commit bd656ee1c7
5 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/users_controller.rb
View file

@ -49,7 +49,7 @@ class UsersController < ApplicationController
@user = get_new_user
else # all other situations (i.e. a non-admin is logged in, or no one is logged in, but we have some users)
@page_title = t('users.no_signups_title')
@admin_email = User.find_admin.preference.admin_email
@admin_email = SITE_CONFIG['admin_email']
render :action => "nosignup", :layout => "login"
return
end
@ -72,7 +72,7 @@ class UsersController < ApplicationController
format.html do
unless User.no_users_yet? || (@user && @user.is_admin?) || SITE_CONFIG['open_signups']
@page_title = t('users.no_signups_title')
@admin_email = User.find_admin.preference.admin_email
@admin_email = SITE_CONFIG['admin_email']
render :action => "nosignup", :layout => "login"
return
end