diff --git a/app/controllers/admins/project_licenses_controller.rb b/app/controllers/admins/project_licenses_controller.rb index d573d3c23..8573b0a37 100644 --- a/app/controllers/admins/project_licenses_controller.rb +++ b/app/controllers/admins/project_licenses_controller.rb @@ -7,7 +7,7 @@ class Admins::ProjectLicensesController < Admins::BaseController sort_by = License.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at' sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc' q = License.ransack(name_cont: params[:search]) - project_licenses = q.result(distinct: true).order("#{sort_by} #{sort_direction}") + project_licenses = q.result(distinct: true).reorder("#{sort_by} #{sort_direction}") @project_licenses = paginate(project_licenses) end @@ -96,7 +96,7 @@ class Admins::ProjectLicensesController < Admins::BaseController end def license_params - params.require(:license).permit(:name,:content) + params.require(:license).permit(:name,:content,:position) end # def validate_params diff --git a/app/models/license.rb b/app/models/license.rb index f84e63573..342bda029 100644 --- a/app/models/license.rb +++ b/app/models/license.rb @@ -7,10 +7,12 @@ # content :text(65535) # created_at :datetime not null # updated_at :datetime not null -# is_secret :boolean default("0") +# position :integer default("0") # class License < ApplicationRecord + default_scope { order(position: :desc) } + include Projectable validates :name, :content, presence: true diff --git a/app/views/admins/project_licenses/_form.html.erb b/app/views/admins/project_licenses/_form.html.erb index c6ec55504..7332138f5 100644 --- a/app/views/admins/project_licenses/_form.html.erb +++ b/app/views/admins/project_licenses/_form.html.erb @@ -30,6 +30,18 @@ + +