fix function name conflict.
This commit is contained in:
parent
71e98453d1
commit
d6aeec1a6c
|
@ -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
|
||||
|
|
|
@ -39,4 +39,4 @@
|
|||
<%end%>
|
||||
</tbody>
|
||||
</table>
|
||||
<%=create_pagination(params[:page].to_i).html_safe%>
|
||||
<%=create_pagination_olympia(params[:page].to_i).html_safe%>
|
|
@ -43,4 +43,4 @@
|
|||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
<%=create_pagination(params[:page].to_i,SignUpSetting.all).html_safe%>
|
||||
<%=create_pagination_olympia(params[:page].to_i,SignUpSetting.all).html_safe%>
|
|
@ -48,4 +48,4 @@
|
|||
</tbody>
|
||||
</table>
|
||||
<% @extra_params = request.query_parameters.map{|key,value| key+'='+value}.join('&') %>
|
||||
<%=create_pagination(params[:page].to_i,@OlympiaSchoolDataFields,@extra_params).html_safe%>
|
||||
<%=create_pagination_olympia(params[:page].to_i,@OlympiaSchoolDataFields,@extra_params).html_safe%>
|
|
@ -46,4 +46,4 @@
|
|||
</tbody>
|
||||
</table>
|
||||
<% @extra_params = request.query_parameters.map{|key,value| key+'='+value}.join('&') %>
|
||||
<%=create_pagination(params[:page].to_i,@student_fields,@extra_params).html_safe%>
|
||||
<%=create_pagination_olympia(params[:page].to_i,@student_fields,@extra_params).html_safe%>
|
|
@ -33,4 +33,4 @@
|
|||
</tbody>
|
||||
</table>
|
||||
<% @extra_params = request.query_parameters.map{|key,value| key+'='+value}.join('&') %>
|
||||
<%=create_pagination(params[:page].to_i,@student_fields,@extra_params).html_safe%>
|
||||
<%=create_pagination_olympia(params[:page].to_i,@student_fields,@extra_params).html_safe%>
|
Loading…
Reference in New Issue