From 4a308922a5f080bae04fd1472150e290752d9711 Mon Sep 17 00:00:00 2001
From: jomo <github@jomo.tv>
Date: Mon, 28 Apr 2014 03:24:07 +0200
Subject: [PATCH] bugfix

---
 app/assets/stylesheets/style.css.scss | 5 +++++
 app/models/user.rb                    | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/style.css.scss b/app/assets/stylesheets/style.css.scss
index 5890679..ae40a83 100644
--- a/app/assets/stylesheets/style.css.scss
+++ b/app/assets/stylesheets/style.css.scss
@@ -379,9 +379,14 @@ select {
 input , select, textarea {
   margin: 4px;
   vertical-align: middle;
+
   &[type=submit] {
     margin: 0;
+    &.btn {
+      cursor: pointer;
+    }
   }
+
   option {
     padding: 0.5em;
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 0606cd5..bd07bbe 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -7,7 +7,7 @@ class User < ActiveRecord::Base
 
   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 :name, :email, :ign
@@ -173,6 +173,10 @@ class User < ActiveRecord::Base
 
   private
 
+  def set_role
+    self.role ||= Role.get(:normal)
+  end
+
   def set_uuid
     if !self.uuid.present?
       # idk