diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-27 12:22:29 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-27 12:22:29 +0100 |
| commit | 67c1a0a951403a546250ea860a3e3d199cae2fce (patch) | |
| tree | f86ec6cedf081a1a57005eca1661e9bead34e4de /app/controllers/intruders_controller.rb | |
| parent | 5d8ce5f4775ac8bc5f523964e6e36f63ff3c4683 (diff) | |
| parent | 211f558a86ae30cdd5b392ab1376e1393f97e22c (diff) | |
Merge branch 'develop'5.1-beta6
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 |