Merge pull request 'fix Admins::GlccExamineMaterial bug' (#296) from KingChan/forgeplus:standalone_develop into standalone_develop
This commit is contained in:
commit
f8a489a1a8
|
@ -13,7 +13,7 @@ class Admins::GlccExamineMaterial < ApplicationQuery
|
||||||
materials = GlccMediumTermExamineMaterial.all
|
materials = GlccMediumTermExamineMaterial.all
|
||||||
|
|
||||||
# term
|
# term
|
||||||
term = params[:term].to_i.zero ? [1, 2] : params[:term].to_i
|
term = params[:term].to_i == 0 ? [1, 2] : params[:term].to_i
|
||||||
materials = materials.where(term: term) if term.present?
|
materials = materials.where(term: term) if term.present?
|
||||||
#year
|
#year
|
||||||
year = if params[:date]
|
year = if params[:date]
|
||||||
|
|
Loading…
Reference in New Issue