github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Don't allow profile bios longer than 3k chars

Browse Source
This commit is contained in:
Robin Ward
2014-09-08 15:17:31 -04:00
parent f2cca140b4
commit 56eda5abf9
9 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/application_controller.rb
View File

@ -292,7 +292,6 @@ class ApplicationController < ActionController::Base
def json_result(obj, opts={})
if yield(obj)
json = success_json
# If we were given a serializer, add the class to the json that comes back
@ -302,7 +301,15 @@ class ApplicationController < ActionController::Base
render json: MultiJson.dump(json)
else
render_json_error(obj)
error_obj = nil
if opts[:additional_errors]
error_target = opts[:additional_errors].find do |o|
target = obj.send(o)
target && target.errors.present?
end
error_obj = obj.send(error_target) if error_target
end
render_json_error(error_obj || obj)
end
end