|
|
|
@ -179,7 +179,7 @@ class WelcomeController < ApplicationController
|
|
|
|
|
content:{}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},[User,Course,Attachment,Project,Memo] ).page(params[:page] || 1).per(20).results
|
|
|
|
|
},[User,Syllabus,Course,Attachment,Project,Memo] ).page(params[:page] || 1).per(20).results
|
|
|
|
|
when 'user'
|
|
|
|
|
@users = User.search(@name).page(params[:page] || 1).per(20)
|
|
|
|
|
when 'syllabus'
|
|
|
|
@ -251,7 +251,7 @@ class WelcomeController < ApplicationController
|
|
|
|
|
content:{}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},[User,Course,Attachment,Project,Memo] ).results.total
|
|
|
|
|
},[User,Syllabus,Course,Attachment,Project,Memo] ).results.total
|
|
|
|
|
# search_type = params[:search_type].to_sym unless search_condition.blank?
|
|
|
|
|
# search_by = params[:search_by]
|
|
|
|
|
#
|
|
|
|
|