diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-26 10:48:43 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-26 10:48:43 +0100 |
| commit | ececfdf24075dd4e2794734a07187750b1b33e13 (patch) | |
| tree | 63538e6f6135ce031da830da0ca6e14515e776e1 /app/controllers/intruders_controller.rb | |
| parent | b144a7885610d605447c80f659643524a839db0c (diff) | |
| parent | ad2121462a9ea9a776756a188779a9d504f078b7 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/controllers/intruders_controller.rb')
| -rw-r--r-- | app/controllers/intruders_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/intruders_controller.rb b/app/controllers/intruders_controller.rb index 147e06d..d3c767e 100644 --- a/app/controllers/intruders_controller.rb +++ b/app/controllers/intruders_controller.rb @@ -1,6 +1,8 @@ class IntrudersController < ApplicationController + load_and_authorize_resource :intruder + def index - @intruders = Intruder.all + @intruders = Intruder.order('list_type ASC, contact_last DESC').all spread_breadcrumbs end |