Skip to content
Snippets Groups Projects
Commit 6f61ee5f authored by Mateus Rambo Strey's avatar Mateus Rambo Strey
Browse files

fix search order by most recent and search collection privacy

parent 0c31da69
No related branches found
No related tags found
No related merge requests found
......@@ -19,9 +19,7 @@ class SearchService
def build_search_query(params={})
order = order_by(params[:order])
ord_attr = order
ord_attr.slice!(' ASC')
ord_attr.slice!(' DESC')
ord_attr = order.split(' ', 2).first
"SELECT @rid.asString(), last_modified, @class, #{ord_attr} FROM ("+main_query(params)+") ORDER BY #{order}"
end
......@@ -30,11 +28,11 @@ class SearchService
end
def collection_query(params={})
qry = "SELECT *, created_at as published_at, out('BelongsTo')[0].name as author FROM Collection"
qry += " WHERE name LUCENE '#{params[:query]}' OR description LUCENE '#{params[:query]}'" unless params[:query].blank?
qry = "SELECT *, created_at as published_at, out('BelongsTo')[0].name as author FROM Collection WHERE privacy = 'public' "
qry += "AND (name LUCENE '#{params[:query]}' OR description LUCENE '#{params[:query]}')" unless params[:query].blank?
qry_filter = params[:query].blank? ? " WHERE " : " AND "
filter = collection_learning_objects_filter(params)
qry += qry_filter+filter unless filter.blank?
qry += " AND "+filter unless filter.blank?
qry
end
......@@ -88,7 +86,7 @@ class SearchService
end
qry
end
def order_by(order)
case order
when 'author'
......@@ -125,4 +123,4 @@ class SearchService
cache_key
end
end
\ No newline at end of file
end
......@@ -55,8 +55,8 @@
<select class="order sort-dropdown" name="order">
<option value="">relevância</option>
<option value="author">autor</option>
<option value="publicationasc">mais recente</option>
<!-- <option value="publicationdesc">mais velhos</option> -->
<option value="publicationdesc">mais recente</option>
<!-- <option value="publicationasc">mais velhos</option> -->
<option value="title">título</option>
</select>
</form>
......
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