diff --git a/app/helpers/admin/olympiamanagements_helper.rb b/app/helpers/admin/olympiamanagements_helper.rb index 62c45c9..c8dc2e1 100644 --- a/app/helpers/admin/olympiamanagements_helper.rb +++ b/app/helpers/admin/olympiamanagements_helper.rb @@ -1,5 +1,5 @@ module Admin::OlympiamanagementsHelper - def create_pagination(page=1,fields=ClassSettingFields.all,extra_params="") + def create_pagination_olympia(page=1,fields=ClassSettingFields.all,extra_params="") page = 1 if page == 0 per_page_num = 10.0 all_page_num = (fields.count / per_page_num).ceil diff --git a/app/views/admin/olympiamanagements/class_setting.html.erb b/app/views/admin/olympiamanagements/class_setting.html.erb index 212db6c..31df43f 100644 --- a/app/views/admin/olympiamanagements/class_setting.html.erb +++ b/app/views/admin/olympiamanagements/class_setting.html.erb @@ -39,4 +39,4 @@ <%end%> -<%=create_pagination(params[:page].to_i).html_safe%> \ No newline at end of file +<%=create_pagination_olympia(params[:page].to_i).html_safe%> \ No newline at end of file diff --git a/app/views/admin/olympiamanagements/index.html.erb b/app/views/admin/olympiamanagements/index.html.erb index 3723b83..0144cef 100644 --- a/app/views/admin/olympiamanagements/index.html.erb +++ b/app/views/admin/olympiamanagements/index.html.erb @@ -43,4 +43,4 @@ <% end %> -<%=create_pagination(params[:page].to_i,SignUpSetting.all).html_safe%> \ No newline at end of file +<%=create_pagination_olympia(params[:page].to_i,SignUpSetting.all).html_safe%> \ No newline at end of file diff --git a/app/views/admin/olympiamanagements/school_data_list.html.erb b/app/views/admin/olympiamanagements/school_data_list.html.erb index 202c12b..526d791 100644 --- a/app/views/admin/olympiamanagements/school_data_list.html.erb +++ b/app/views/admin/olympiamanagements/school_data_list.html.erb @@ -48,4 +48,4 @@ <% @extra_params = request.query_parameters.map{|key,value| key+'='+value}.join('&') %> -<%=create_pagination(params[:page].to_i,@OlympiaSchoolDataFields,@extra_params).html_safe%> \ No newline at end of file +<%=create_pagination_olympia(params[:page].to_i,@OlympiaSchoolDataFields,@extra_params).html_safe%> \ No newline at end of file diff --git a/app/views/admin/olympiamanagements/sign_up_student_data_list.html.erb b/app/views/admin/olympiamanagements/sign_up_student_data_list.html.erb index f6741b9..a5699b8 100644 --- a/app/views/admin/olympiamanagements/sign_up_student_data_list.html.erb +++ b/app/views/admin/olympiamanagements/sign_up_student_data_list.html.erb @@ -46,4 +46,4 @@ <% @extra_params = request.query_parameters.map{|key,value| key+'='+value}.join('&') %> -<%=create_pagination(params[:page].to_i,@student_fields,@extra_params).html_safe%> \ No newline at end of file +<%=create_pagination_olympia(params[:page].to_i,@student_fields,@extra_params).html_safe%> \ No newline at end of file diff --git a/app/views/olympiamanagements/_student_data_list.html.erb b/app/views/olympiamanagements/_student_data_list.html.erb index f0b4fa7..8224690 100644 --- a/app/views/olympiamanagements/_student_data_list.html.erb +++ b/app/views/olympiamanagements/_student_data_list.html.erb @@ -33,4 +33,4 @@ <% @extra_params = request.query_parameters.map{|key,value| key+'='+value}.join('&') %> -<%=create_pagination(params[:page].to_i,@student_fields,@extra_params).html_safe%> \ No newline at end of file +<%=create_pagination_olympia(params[:page].to_i,@student_fields,@extra_params).html_safe%> \ No newline at end of file