Commit 4103c19e authored by Weblate's avatar Weblate

Merge remote-tracking branch 'origin/master'

parents 3eb62a89 a51e24d4
......@@ -119,7 +119,7 @@ module Noosfero
root 'communities', 'community'
expose :description
expose :admins do |community, options|
community.admins.map{|admin| {"name"=>admin.name, "id"=>admin.id}}
community.admins.map{|admin| {"name"=>admin.name, "id"=>admin.id, "username" => admin.identifier}}
end
expose :categories, :using => Category
expose :members, :using => Person
......
......@@ -5,7 +5,9 @@ class DestroyRejectedReports < ActiveRecord::Migration
settings = YAML.load(task['data'])
comments << settings[:organization_rating_comment_id]
end
execute("DELETE FROM comments WHERE id IN (#{comments.join(',')})") if comments.present?
if !comments.empty?
execute("DELETE FROM comments WHERE id IN (#{comments.join(',')})")
end
end
def down
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment