diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index fb1cc4baa..e972ef7e9 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -51,12 +51,12 @@ class IssuesController < ApplicationController issues = issues.where(issue_type: params[:issue_type].to_s) if params[:issue_type].present? && params[:issue_type].to_s != "all" issues = issues.joins(:issue_tags).where(issue_tags: {id: params[:issue_tag_id].to_i}) if params[:issue_tag_id].present? && params[:issue_tag_id].to_s != "all" - order_type = params[:order_type] || "desc" #或者"asc" - order_name = params[:order_name] || "created_on" #或者"updated_on" + order_type = params[:order_type].present? ? params[:order_type] : "desc" #或者"asc" + order_name = params[:order_name].present? ? params[:order_name] : "created_on" #或者"updated_on" @page = params[:page] @limit = params[:limit] || 15 - @issues = issues.order("#{order_name} #{order_type}") + # @issues = issues.order("#{order_name} #{order_type}") @issues_size = issues.size @issues = issues.order("#{order_name} #{order_type}").page(@page).per(@limit) diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 45ba882d0..4057e7b97 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -8,7 +8,7 @@ class Attachment < ApplicationRecord belongs_to :author, class_name: "User", foreign_key: :author_id # belongs_to :course, foreign_key: :container_id, optional: true # has_many :attachment_group_settings, :dependent => :destroy - has_many :attachment_histories, -> { order(version: :desc) }, :dependent => :destroy + # has_many :attachment_histories, -> { order(version: :desc) }, :dependent => :destroy # 二级目录 # belongs_to :course_second_category, optional: true