[PATCH conductor 21/22] Make filter_table more configurable

[ifarkas]

From: Imre Farkas <ifar...@redhat.com>

---
 src/app/helpers/application_helper.rb              |  2 +-
 src/app/helpers/provider_accounts_helper.rb        | 23 +++++++---------------
 .../_add_provider_accounts_form.html.haml          |  2 +-
 .../pool_families/_provider_accounts.html.haml     |  2 +-
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/app/helpers/application_helper.rb 
b/src/app/helpers/application_helper.rb
index 8480508..6ddee96 100644
--- a/src/app/helpers/application_helper.rb
+++ b/src/app/helpers/application_helper.rb
@@ -67,7 +67,7 @@ module ApplicationHelper
     end
   end
 
-  def filter_table(columns, rows, options={}, &block)
+  def filter_table(columns, rows, options = {}, &block)
     _class = rows.first.try(:class) || Object
     render :partial => 'layouts/filter_table', :locals => {
         :form_header => options[:form_header] || :form_header,
diff --git a/src/app/helpers/provider_accounts_helper.rb 
b/src/app/helpers/provider_accounts_helper.rb
index 49d96ff..ab5cf80 100644
--- a/src/app/helpers/provider_accounts_helper.rb
+++ b/src/app/helpers/provider_accounts_helper.rb
@@ -14,23 +14,14 @@
 #   limitations under the License.
 #
 module ProviderAccountsHelper
-  def provider_accounts_header
-    [
-      { :name => 'checkbox', :sortable => false, :class => 'checkbox' },
-      { :name => '', :sortable => false, :class => 'alert' },
-      { :name => t("provider_accounts.index.provider_account_name"), :sortable 
=> false },
-      { :name => t("provider_accounts.index.username"), :sortable => false},
-      { :name => t("provider_accounts.index.provider_name"), :sortable => 
false },
-      { :name => t("provider_accounts.index.provider_type"), :sortable => 
false },
-      { :name => t("provider_accounts.index.priority"), :sortable => false, 
:class => 'center' },
-      { :name => t("quota_used"), :sortable => false, :class => 'center' },
-      { :name => t("provider_accounts.index.quota_limit"), :sortable => false, 
:class => 'center' }
-    ]
-  end
+  def provider_accounts_header(options = {})
+    columns = [{ :name => 'checkbox', :sortable => false, :class => 'checkbox' 
}]
+
+    unless options[:without_alert]
+      columns << { :name => '', :sortable => false, :class => 'alert' }
+    end
 
-  def no_alerts_provider_accounts_header
-    [
-      { :name => 'checkbox', :sortable => false, :class => 'checkbox' },
+    columns += [
       { :name => t("provider_accounts.index.provider_account_name"), :sortable 
=> false },
       { :name => t("provider_accounts.index.username"), :sortable => false},
       { :name => t("provider_accounts.index.provider_name"), :sortable => 
false },
diff --git a/src/app/views/pool_families/_add_provider_accounts_form.html.haml 
b/src/app/views/pool_families/_add_provider_accounts_form.html.haml
index bdb4680..e596960 100644
--- a/src/app/views/pool_families/_add_provider_accounts_form.html.haml
+++ b/src/app/views/pool_families/_add_provider_accounts_form.html.haml
@@ -1,7 +1,7 @@
 - content_for :form_footer do
   = link_to t('cancel'), pool_family_path(@pool_family, :details_tab => 
'provider_accounts'), :class => 'button danger'
   = restful_submit_tag t('provider_accounts.add_provider_account'), "create", 
add_provider_accounts_pool_family_path(@pool_family), 'POST', :id => 
'save_button', :class => 'button'
-= filter_table(no_alerts_provider_accounts_header, @provider_accounts) do 
|account|
+= filter_table(provider_accounts_header(:without_alert => true), 
@provider_accounts) do |account|
   %tr{:class => cycle('nostripe','stripe')}
     %td{:class => 'checkbox'}
       - if check_privilege(Privilege::MODIFY)
diff --git a/src/app/views/pool_families/_provider_accounts.html.haml 
b/src/app/views/pool_families/_provider_accounts.html.haml
index b892a79..cfda880 100644
--- a/src/app/views/pool_families/_provider_accounts.html.haml
+++ b/src/app/views/pool_families/_provider_accounts.html.haml
@@ -3,7 +3,7 @@
     %li= link_to t('provider_accounts.add_provider_account'), 
add_provider_accounts_pool_family_path(@pool_family), { :class => 'button 
primary', :id => 'add_provider_accounts_button'}
     %li= restful_submit_tag t('provider_accounts.remove_provider_accounts'), 
"destroy", remove_provider_accounts_pool_family_path(@pool_family), 'POST', :id 
=> 'remove_button', :class => 'button danger'
 
-= filter_table(no_alerts_provider_accounts_header, 
@pool_family.provider_accounts) do |account|
+= filter_table(provider_accounts_header(:without_alert => true), 
@pool_family.provider_accounts) do |account|
   %tr{:class => cycle('nostripe','stripe')}
     %td{:class => 'checkbox'}
       - if check_privilege(Privilege::MODIFY)
-- 
1.7.11.2