Maintenance: Moved pagination controller concern to the proper place.
This commit is contained in:
parent
2a429af5af
commit
ae4f400713
9 changed files with 10 additions and 10 deletions
|
@ -3,7 +3,7 @@
|
|||
module ApplicationController::RendersModels
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
include ApplicationController::Paginates
|
||||
include CanPaginate
|
||||
|
||||
private
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/
|
||||
|
||||
module ApplicationController::Paginates
|
||||
module CanPaginate
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
def paginate_with(max: nil, default: nil)
|
||||
|
@ -11,6 +11,6 @@ module ApplicationController::Paginates
|
|||
private
|
||||
|
||||
def pagination
|
||||
@pagination ||= ::ApplicationController::Paginates::Pagination.new(params, max: @paginate_max, default: @paginate_default)
|
||||
@pagination ||= CanPaginate::Pagination.new(params, max: @paginate_max, default: @paginate_default)
|
||||
end
|
||||
end
|
|
@ -1,6 +1,6 @@
|
|||
# Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/
|
||||
|
||||
class ApplicationController::Paginates::Pagination
|
||||
class CanPaginate::Pagination
|
||||
|
||||
def initialize(params, default: nil, max: nil)
|
||||
@params = params
|
|
@ -6,7 +6,7 @@ class KnowledgeBase::SearchController < ApplicationController
|
|||
|
||||
include KnowledgeBaseHelper
|
||||
include ActionView::Helpers::SanitizeHelper
|
||||
include ApplicationController::Paginates
|
||||
include CanPaginate
|
||||
|
||||
# POST /api/v1/knowledge_bases/search
|
||||
# knowledge_base_id, locale, flavor, index, page, per_page, limit, include_locale
|
||||
|
|
|
@ -4,7 +4,7 @@ class OrganizationsController < ApplicationController
|
|||
prepend_before_action -> { authorize! }, except: %i[index show]
|
||||
prepend_before_action { authentication_check }
|
||||
|
||||
include ApplicationController::Paginates
|
||||
include CanPaginate
|
||||
|
||||
=begin
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ class TicketsController < ApplicationController
|
|||
include ClonesTicketArticleAttachments
|
||||
include ChecksUserAttributesByCurrentUserPermission
|
||||
include TicketStats
|
||||
include ApplicationController::Paginates
|
||||
include CanPaginate
|
||||
|
||||
prepend_before_action -> { authorize! }, only: %i[create selector import_example import_start ticket_customer ticket_history ticket_related ticket_recent ticket_merge ticket_split]
|
||||
prepend_before_action :authentication_check
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
class UsersController < ApplicationController
|
||||
include ChecksUserAttributesByCurrentUserPermission
|
||||
include ApplicationController::Paginates
|
||||
include CanPaginate
|
||||
|
||||
prepend_before_action -> { authorize! }, only: %i[import_example import_start search history unlock]
|
||||
prepend_before_action :authentication_check, except: %i[create password_reset_send password_reset_verify image email_verify email_verify_send]
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe ApplicationController::Paginates::Pagination do
|
||||
RSpec.describe CanPaginate::Pagination do
|
||||
describe '#limit' do
|
||||
it 'returns as set in params' do
|
||||
instance = described_class.new({ per_page: 123 })
|
|
@ -1,7 +1,7 @@
|
|||
# Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/
|
||||
|
||||
FactoryBot.define do
|
||||
factory :'application_controller/paginates/pagination', aliases: %i[pagination] do
|
||||
factory :'can_paginate/pagination', aliases: %i[pagination] do
|
||||
|
||||
params { {} }
|
||||
default { nil }
|
||||
|
|
Loading…
Reference in a new issue