| @@ -2,7 +2,7 @@ class Admins::Topic::CooperatorsController < Admins::Topic::BaseController | |||||
| before_action :find_cooperator, only: [:edit, :update, :destroy] | before_action :find_cooperator, only: [:edit, :update, :destroy] | ||||
| def index | def index | ||||
| @cooperators = kaminari_paginate(::Topic::Cooperator) | |||||
| @cooperators = paginate(::Topic::Cooperator) | |||||
| end | end | ||||
| def new | def new | ||||
| @@ -682,7 +682,7 @@ class ApplicationController < ActionController::Base | |||||
| def kaminari_paginate(relation) | def kaminari_paginate(relation) | ||||
| limit = params[:limit] || params[:per_page] | limit = params[:limit] || params[:per_page] | ||||
| limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i | |||||
| limit = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i | |||||
| page = params[:page].to_i.zero? ? 1 : params[:page].to_i | page = params[:page].to_i.zero? ? 1 : params[:page].to_i | ||||
| relation.page(page).per(limit) | relation.page(page).per(limit) | ||||
| @@ -690,7 +690,7 @@ class ApplicationController < ActionController::Base | |||||
| def kaminari_array_paginate(relation) | def kaminari_array_paginate(relation) | ||||
| limit = params[:limit] || params[:per_page] | limit = params[:limit] || params[:per_page] | ||||
| limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i | |||||
| limit = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i | |||||
| page = params[:page].to_i.zero? ? 1 : params[:page].to_i | page = params[:page].to_i.zero? ? 1 : params[:page].to_i | ||||
| Kaminari.paginate_array(relation).page(page).per(limit) | Kaminari.paginate_array(relation).page(page).per(limit) | ||||
| @@ -14,7 +14,7 @@ | |||||
| <tr class="banner-item-<%= banner.id %>"> | <tr class="banner-item-<%= banner.id %>"> | ||||
| <td><%= list_index_no((params[:page] || 1).to_i, index) %></td> | <td><%= list_index_no((params[:page] || 1).to_i, index) %></td> | ||||
| <td><%= banner.title %></td> | <td><%= banner.title %></td> | ||||
| <td><img style="height:50px" src="<%= banner.image %>" /></td> | |||||
| <td><img style="width:150px" src="<%= banner.image %>" /></td> | |||||
| <td><%= banner.order_index %></td> | <td><%= banner.order_index %></td> | ||||
| <td class="action-container"> | <td class="action-container"> | ||||
| <%= link_to "编辑", edit_admins_topic_banner_path(banner), remote: true, class: "action" %> | <%= link_to "编辑", edit_admins_topic_banner_path(banner), remote: true, class: "action" %> | ||||
| @@ -16,7 +16,7 @@ | |||||
| <td><%= list_index_no((params[:page] || 1).to_i, index) %></td> | <td><%= list_index_no((params[:page] || 1).to_i, index) %></td> | ||||
| <td><%= cooperator.title %></td> | <td><%= cooperator.title %></td> | ||||
| <td><%= cooperator.url %></td> | <td><%= cooperator.url %></td> | ||||
| <td><img style="height:50px" src="<%= cooperator.image %>" /></td> | |||||
| <td><img style="width:150px" src="<%= cooperator.image %>" /></td> | |||||
| <td><%= cooperator.order_index %></td> | <td><%= cooperator.order_index %></td> | ||||
| <td class="action-container"> | <td class="action-container"> | ||||
| <%= link_to "编辑", edit_admins_topic_cooperator_path(cooperator), remote: true, class: "action" %> | <%= link_to "编辑", edit_admins_topic_cooperator_path(cooperator), remote: true, class: "action" %> | ||||