mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-21 12:22:38 +09:00
appmarket: Fix password generation and href link
This commit is contained in:
1 parent
35cc30144a
commit
e67646a175
4 files changed
+4
-4
No files matched your search
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user