Merge branch 'dev_aliyun' into dev_chen

PCqiandao
cxt 5 years ago
commit 5a12c1f8d5

@ -42,6 +42,10 @@ class FilesController < ApplicationController
@unpublish_count = @total_count - @publish_count
@attachments = @attachments.by_keywords(params[:search])
if params[:no_link]
@attachments = @attachments.where(link: nil)
end
@attachments = @attachments.page(@page).per(@page_size)
end

Loading…
Cancel
Save