From 1a769601f08588fa33725c875232dbf5ff97d1cb Mon Sep 17 00:00:00 2001 From: Tim Guo Date: Thu, 20 Nov 2014 22:16:51 -0800 Subject: [PATCH] minor improvement --- app/controllers/application_controller.rb | 2 +- app/views/layouts/_nav.slim | 2 +- config/initializers/redis-object.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 19fc692..b6b5b29 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -4,7 +4,7 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :null_session, except: :api def must_be_admin - (current_user.admin?) ? () : (raise RoleForbiddenError) + raise RoleForbiddenError if current_user.admin? end private diff --git a/app/views/layouts/_nav.slim b/app/views/layouts/_nav.slim index 3e9bcb3..fe07030 100644 --- a/app/views/layouts/_nav.slim +++ b/app/views/layouts/_nav.slim @@ -41,7 +41,7 @@ nav.navbar.navbar-fixed-top.headroom.tk#global_nav role="navigation" == fa_icon 'sign-up' | 注册 li.hidden-xs - a data-toggle="modal" data-target="#sign_in_modal" role="button" + a data-toggle="modal" data-target="#sign_in_modal" role="button" href="" == fa_icon 'sign_in' | 登录 li.dropdown.only-xs diff --git a/config/initializers/redis-object.rb b/config/initializers/redis-object.rb index de76063..8e3c96a 100644 --- a/config/initializers/redis-object.rb +++ b/config/initializers/redis-object.rb @@ -1 +1 @@ -Redis.current = Redis.new(:host => '127.0.0.1', :port => 6379) +$redis = Redis.current = Redis.new(:host => '127.0.0.1', :port => 6379)