diff --git a/market/controllers/appmarket-server.rb b/market/controllers/appmarket-server.rb index f0c25f6325..83a157d02a 100644 --- a/market/controllers/appmarket-server.rb +++ b/market/controllers/appmarket-server.rb @@ -171,7 +171,7 @@ post '/user/:id/enable' do # status 404 #end - if setting.config['mail'] + if settings.config['mail'] Mailer.send_enable(user['email'], user['username']) end end diff --git a/market/models/user.rb b/market/models/user.rb index 47ed8aec38..5aff57f332 100644 --- a/market/models/user.rb +++ b/market/models/user.rb @@ -86,7 +86,7 @@ class User validator.validate!(hash, session.schema(:user)) - hash[:password] = generate_password(hash[:password]) + hash['password'] = generate_password(hash['password']) user_collection.insert(hash, {:safe => true}) end diff --git a/market/views/user_index.haml b/market/views/user_index.haml index 068c883d18..28ccd3165a 100644 --- a/market/views/user_index.haml +++ b/market/views/user_index.haml @@ -16,7 +16,7 @@ .navbar.navbar-static .navbar-inner .container - %a.brand{href => "/"} Appliances + %a.brand{'href' => "/"} Appliances = haml :nav_login %table{'class' => "table table-striped", 'id' => "users"} diff --git a/market/views/user_show.haml b/market/views/user_show.haml index 6176974935..676aa20513 100644 --- a/market/views/user_show.haml +++ b/market/views/user_show.haml @@ -16,7 +16,7 @@ .navbar.navbar-static .navbar-inner .container - %a.brand{href => "/user"} Users + %a.brand{'href' => "/user"} Users = haml :nav_login .container-fluid