chiu
/
olympiamanagement
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix function name conflict.

This commit is contained in:
BOHUNG 2020-03-11 17:54:43 +08:00
parent 71e98453d1
commit d6aeec1a6c
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/admin/olympiamanagements_helper.rb
View File

@ -1,5 +1,5 @@
module Admin::OlympiamanagementsHelper 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 page = 1 if page == 0
per_page_num = 10.0 per_page_num = 10.0
all_page_num = (fields.count / per_page_num).ceil all_page_num = (fields.count / per_page_num).ceil

2
app/views/admin/olympiamanagements/class_setting.html.erb
View File

@ -39,4 +39,4 @@
<%end%> <%end%>
</tbody> </tbody>
</table> </table>
<%=create_pagination(params[:page].to_i).html_safe%> <%=create_pagination_olympia(params[:page].to_i).html_safe%>

2
app/views/admin/olympiamanagements/index.html.erb
View File

@ -43,4 +43,4 @@
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
<%=create_pagination(params[:page].to_i,SignUpSetting.all).html_safe%> <%=create_pagination_olympia(params[:page].to_i,SignUpSetting.all).html_safe%>

2
app/views/admin/olympiamanagements/school_data_list.html.erb
View File

@ -48,4 +48,4 @@
</tbody> </tbody>
</table> </table>
<% @extra_params = request.query_parameters.map{|key,value| key+'='+value}.join('&') %> <% @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%>

2
app/views/admin/olympiamanagements/sign_up_student_data_list.html.erb
View File

@ -46,4 +46,4 @@
</tbody> </tbody>
</table> </table>
<% @extra_params = request.query_parameters.map{|key,value| key+'='+value}.join('&') %> <% @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%>

2
app/views/olympiamanagements/_student_data_list.html.erb
View File

@ -33,4 +33,4 @@
</tbody> </tbody>
</table> </table>
<% @extra_params = request.query_parameters.map{|key,value| key+'='+value}.join('&') %> <% @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%>