Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

bugfix

Browse Source
This commit is contained in:
jomo
2014-04-28 03:24:07 +02:00
parent 65f5adf65d
commit 4a308922a5
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/style.css.scss
View File

@@ -379,9 +379,14 @@ select {
input , select, textarea { input , select, textarea {
margin: 4px; margin: 4px;
vertical-align: middle; vertical-align: middle;
&[type=submit] { &[type=submit] {
margin: 0; margin: 0;
&.btn {
cursor: pointer;
}
} }
option { option {
padding: 0.5em; padding: 0.5em;

6
app/models/user.rb
View File

@@ -7,7 +7,7 @@ class User < ActiveRecord::Base
has_secure_password has_secure_password
before_validation :strip_whitespaces, :set_uuid, :set_name, :set_email_token before_validation :strip_whitespaces, :set_uuid, :set_name, :set_email_token, set_role
validates_presence_of :password, :password_confirmation, :email_token, :on => :create validates_presence_of :password, :password_confirmation, :email_token, :on => :create
validates_presence_of :name, :email, :ign validates_presence_of :name, :email, :ign
@@ -173,6 +173,10 @@ class User < ActiveRecord::Base
private private
def set_role
self.role ||= Role.get(:normal)
end
def set_uuid def set_uuid
if !self.uuid.present? if !self.uuid.present?
# idk # idk