Skip to content
Snippets Groups Projects
Commit e4012553 authored by Clarissa's avatar Clarissa
Browse files

Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into issue/281

parents 7d98a31c 461cd2ed
No related branches found
No related tags found
No related merge requests found
......@@ -48,7 +48,11 @@ class V1::FeedController < ApplicationController
end
end
values[0] = query[0..-3]+")" # remove trailing "or" on the query
if query[-1] == "("
query = query[0..-6]
else
values[0] = query[0..-3]+")" # remove trailing "or" on the query
end
return PublicActivity::Activity.where(key: activities_filter).where(values).order(created_at: :desc)
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment