Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

11 years ago · d9a7e2181c
parent feccad8fa5 d7d49d2fbd
commit d9a7e2181c
2 changed files with 1110 additions and 1113 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -364,10 +364,10 @@ class User < Principal
        end
      end
    end
-    if user && !user.new_record?
+    unless user.nil?
      last_login_on = user.last_login_on.nil? ? '' : user.last_login_on.to_s
-      user.update_column(:last_login_on, Time.now)
    end
+    user.update_column(:last_login_on, Time.now) if user && !user.new_record?
    [user, last_login_on]
  rescue => text
    raise text
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@ -20,10 +20,7 @@
        }
    }
 </script>
-<head>
-  <meta http-equiv="X-UA-Compatible" content="IE=9">
-  <meta http-equiv="Content-Type" content="text/html; charset={CHARSET}" />
-</head>
+
 <div id="login-form">
 <%= form_tag(signin_path) do %>
 <%= back_url_hidden_field_tag %>