Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

dev_local_cqdsj
杨树明 5 years ago
commit 3acf68ba60

@ -27,5 +27,9 @@ json.competitions do
# json.end_time section.display_end_time
# end
# end
json.permission do
json.editable current_user.admin_or_business? || (competition.nearly_published? && competition.manager?(current_user))
end
end
end
Loading…
Cancel
Save