Merge branch 'clean_development' into lukas/picked_ques

This commit is contained in:
iCross committed 2013-06-06 19:08:59 +08:00
commit 8c1e65994a
24 files changed
+204 -46

No files matched your search

+6 -1
View File
@@ -2,8 +2,13 @@ module ApplicationHelper
FLASH_NOTICE_KEYS = [:error, :notice, :warning]
def current_path(param_hash)
request.referer.include?('?') ? [request.referer,param_hash.to_param].join('&') : [request.referer,param_hash.to_param].join('?')
end
def delayed_impressionist(object)
Resque.enqueue_at(1.minute.from_now,DelayedImpressionist,object)
# Resque.enqueue_at(1.minute.from_now,DelayedImpressionist,object)
end
def check_user_role_enable(attribute_fields)