diff --git a/app/controllers/paginable/themes_controller.rb b/app/controllers/paginable/themes_controller.rb index 94721a8..8a4bb30 100644 --- a/app/controllers/paginable/themes_controller.rb +++ b/app/controllers/paginable/themes_controller.rb @@ -3,10 +3,10 @@ include Paginable # /paginable/themes/index/:page def index - raise Pundit::NotAuthorizedError unless SuperAdmin::ThemePolicy.new(current_user).index? + authorize(Theme) themes = params[:page] == 'ALL' ? - Theme.all : - Theme.page(params[:page]) + Theme.updated_at_desc : + Theme.updated_at_desc.page(params[:page]) paginable_renderise(partial: 'index', scope: themes) end end diff --git a/app/controllers/super_admin/themes_controller.rb b/app/controllers/super_admin/themes_controller.rb index 94c13f7..f1fbc6c 100644 --- a/app/controllers/super_admin/themes_controller.rb +++ b/app/controllers/super_admin/themes_controller.rb @@ -3,7 +3,7 @@ helper PaginableHelper def index authorize(Theme) - render(:index, locals: { themes: Theme.page(1) }) + render(:index, locals: { themes: Theme.updated_at_desc.page(1) }) end def new diff --git a/app/models/theme.rb b/app/models/theme.rb index bd787f6..5a95c48 100644 --- a/app/models/theme.rb +++ b/app/models/theme.rb @@ -15,12 +15,7 @@ validates :title, presence: {message: _("can't be blank")} - # EVALUATE CLASS AND INSTANCE METHODS BELOW - # - # What do they do? do they do it efficiently, and do we need them? - - - + scope :updated_at_desc, -> { self.all.order(updated_at: 'DESC') } ## # returns the title of the theme #