OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rails upgrade to 4
[pettanr/pettanr.git]
/
app
/
controllers
/
system_controller.rb
diff --git
a/app/controllers/system_controller.rb
b/app/controllers/system_controller.rb
index
be48d47
..
f5f8d95
100644
(file)
--- a/
app/controllers/system_controller.rb
+++ b/
app/controllers/system_controller.rb
@@
-1,5
+1,5
@@
class SystemController < ApplicationController
class SystemController < ApplicationController
- before_
filter
:authenticate_admin!, :except => [:start]
+ before_
action
:authenticate_admin!, :except => [:start]
#layout :system
#layout :system
@@
-64,7
+64,7
@@
class SystemController < ApplicationController
end
def waiting_list
end
def waiting_list
- @waits = Admin.
find(:all, :conditions => ['approve = 0']
)
+ @waits = Admin.
where(approve: 0
)
end
def accept_admin
end
def accept_admin