Description:
Merge branch 'master' into codejom (bug fix)
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
Jittat Fakcharoenphol
-
r230:1925d77bb0c3 - - 1 file changed: 1 inserted, 1 deleted
| @@ -12,25 +12,25 | |||
|
|
12 | 12 | # COMMENT OUT: only need when having high load |
|
|
13 | 13 | # caches_action :index, :login |
|
|
14 | 14 | |
|
|
15 | 15 | # NOTE: This method is not actually needed, 'config/routes.rb' has |
|
|
16 | 16 | # assigned action login as a default action. |
|
|
17 | 17 | def index |
|
|
18 | 18 | redirect_to :action => 'login' |
|
|
19 | 19 | end |
|
|
20 | 20 | |
|
|
21 | 21 | def login |
|
|
22 | 22 | saved_notice = flash[:notice] |
|
|
23 | 23 | reset_session |
|
|
24 | - flash[:notice] = saved_notice | |
|
|
24 | + flash.now[:notice] = saved_notice | |
|
|
25 | 25 | |
|
|
26 | 26 | # EXPERIMENT: |
|
|
27 | 27 | # Hide login if in single user mode and the url does not |
|
|
28 | 28 | # explicitly specify /login |
|
|
29 | 29 | # |
|
|
30 | 30 | # logger.info "PATH: #{request.path}" |
|
|
31 | 31 | # if Configuration['system.single_user_mode'] and |
|
|
32 | 32 | # request.path!='/main/login' |
|
|
33 | 33 | # @hidelogin = true |
|
|
34 | 34 | # end |
|
|
35 | 35 | |
|
|
36 | 36 | @announcements = Announcement.find_for_frontpage |
You need to be logged in to leave comments.
Login now