From: Jan Provaznik <jprovazn(a)redhat.com>
Temporary solution, we will need pagination+perms filtering+searching,
on many places so something smarter will be required. Maybe create named
scope from 'list_for_user' method? Fixing in this controller because
passwords are listed in XML output.
---
.../controllers/provider_accounts_controller.rb | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/app/controllers/provider_accounts_controller.rb
b/src/app/controllers/provider_accounts_controller.rb
index 4dcd48d..40dae13 100644
--- a/src/app/controllers/provider_accounts_controller.rb
+++ b/src/app/controllers/provider_accounts_controller.rb
@@ -1,17 +1,17 @@
class ProviderAccountsController < ApplicationController
before_filter :require_user
- before_filter :load_accounts, :only => :show
+ before_filter :load_accounts, :only => [:index,:show]
before_filter :set_view_vars, :only => [:index,:show]
def index
+ # TODO: this is temporary solution how to combine search and permissions
+ # filtering
@search_term = params[:q]
- if @search_term.blank?
- load_accounts
- else
+ unless @search_term.blank?
search = ProviderAccount.search do
keywords(params[:q])
end
- @accounts = search.results
+ @accounts &= search.results
end
respond_to do |format|
@@ -172,9 +172,6 @@ class ProviderAccountsController < ApplicationController
end
def load_accounts
- @accounts = ProviderAccount.paginate(:all,
- :page => params[:page] || 1,
- :order => (params[:order_field] || 'label') +' '+
(params[:order_dir] || 'asc')
- )
+ @accounts = ProviderAccount.list_for_user(current_user, Privilege::VIEW)
end
end
--
1.7.4
Show replies by date