harrybomrah
/
personal-lab
forked from saurabh/personal-lab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update sort.

This commit is contained in:
BoHung Chiu 2022-07-26 19:03:14 +08:00
parent 161508f43a
commit f1b91eea20
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/labs_controller.rb
View File

@ -10,7 +10,7 @@ class Admin::LabsController < OrbitMemberController
before_action :allow_admin_only, :only => [:index, :setting] before_action :allow_admin_only, :only => [:index, :setting]
def index def index
@labs = Lab.order_by(:year=>'desc').page(params[:page]).per(10) @labs = Lab.sort_year.page(params[:page]).per(10)
end end
def new def new

2
app/controllers/personal_labs_controller.rb
View File

@ -1,6 +1,6 @@
class PersonalLabsController < ApplicationController class PersonalLabsController < ApplicationController
def index def index
labs = Lab.where(:is_hidden=>false).order_by(:year=>'desc').page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count) labs = Lab.sort_for_frontend.page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count)
lab_list = labs.collect do |lab| lab_list = labs.collect do |lab|
member = lab.member_profile member = lab.member_profile
path = OrbitHelper.url_to_plugin_show(member.to_param, 'member') rescue '#' path = OrbitHelper.url_to_plugin_show(member.to_param, 'member') rescue '#'

4
app/models/lab.rb
View File

@ -29,7 +29,9 @@ class Lab
before_validation :add_http before_validation :add_http
scope :sort_for_frontend, ->{ where(:is_hidden=>false).order_by(:year => "desc") } index({year: -1, _id: -1}, { unique: false, background: false })
scope :sort_year, ->{ order_by(:year => "desc", :id=>"desc") }
scope :sort_for_frontend, ->{ where(:is_hidden=>false).order_by(:year => "desc", :id=>"desc") }
def get_plugin_data(fields_to_show) def get_plugin_data(fields_to_show)
plugin_datas = [] plugin_datas = []

4
app/views/plugin/personal_lab/_profile.html.erb
View File

@ -7,9 +7,9 @@
<% <%
if has_access? if has_access?
@labs = Lab.where(member_profile_id: @member.id).desc(:year).page(params[:page]).per(10) @labs = Lab.where(member_profile_id: @member.id).sort_year.page(params[:page]).per(10)
else else
@labs = Lab.where(is_hidden: false, member_profile_id: @member.id).desc(:year).page(params[:page]).per(10) @labs = Lab.where(is_hidden: false, member_profile_id: @member.id).sort_year.page(params[:page]).per(10)
end end
%> %>