Commit 991c68a4e4fc3020afe9b2b259cb3b136ef9c371
1 parent
9efdcbd7
Exists in
api_tasks
and in
4 other branches
api: avoid exception treatment case for every presentation
Showing
1 changed file
with
3 additions
and
3 deletions
Show diff stats
lib/noosfero/api/entity.rb
| @@ -6,9 +6,7 @@ class Noosfero::API::Entity < Grape::Entity | @@ -6,9 +6,7 @@ class Noosfero::API::Entity < Grape::Entity | ||
| 6 | end | 6 | end |
| 7 | 7 | ||
| 8 | def self.represent(objects, options = {}) | 8 | def self.represent(objects, options = {}) |
| 9 | - if options[:is_inner_data] | ||
| 10 | - super objects, options | ||
| 11 | - else | 9 | + if options[:has_exception] |
| 12 | data = super objects, options.merge(is_inner_data: true) | 10 | data = super objects, options.merge(is_inner_data: true) |
| 13 | if objects.is_a? Exception | 11 | if objects.is_a? Exception |
| 14 | data.merge ok: false, error: { | 12 | data.merge ok: false, error: { |
| @@ -18,6 +16,8 @@ class Noosfero::API::Entity < Grape::Entity | @@ -18,6 +16,8 @@ class Noosfero::API::Entity < Grape::Entity | ||
| 18 | else | 16 | else |
| 19 | data.merge ok: true, error: { type: 'Success', message: '' } | 17 | data.merge ok: true, error: { type: 'Success', message: '' } |
| 20 | end | 18 | end |
| 19 | + else | ||
| 20 | + super objects, options | ||
| 21 | end | 21 | end |
| 22 | end | 22 | end |
| 23 | 23 |