Commit c16f5ff89ab63fe21a9708849f02538f9acaf879
Committed by
Gabriela Navarro
1 parent
f905965f
Fix software catalog list result order, issue #139
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Showing
2 changed files
with
9 additions
and
3 deletions
Show diff stats
lib/ext/search_controller.rb
@@ -23,10 +23,11 @@ class SearchController | @@ -23,10 +23,11 @@ class SearchController | ||
23 | def software_infos | 23 | def software_infos |
24 | prepare_software_search_page | 24 | prepare_software_search_page |
25 | results = filter_software_infos_list | 25 | results = filter_software_infos_list |
26 | + @software_count = results.count | ||
26 | results = results.paginate(:per_page => @per_page, :page => params[:page]) | 27 | results = results.paginate(:per_page => @per_page, :page => params[:page]) |
27 | @searches[@asset] = {:results => results} | 28 | @searches[@asset] = {:results => results} |
28 | @search = results | 29 | @search = results |
29 | - @software_count = filter_software_infos_list.count | 30 | + |
30 | render :layout=>false if request.xhr? | 31 | render :layout=>false if request.xhr? |
31 | end | 32 | end |
32 | 33 | ||
@@ -96,7 +97,7 @@ class SearchController | @@ -96,7 +97,7 @@ class SearchController | ||
96 | end | 97 | end |
97 | 98 | ||
98 | def sort_communities_list communities_list | 99 | def sort_communities_list communities_list |
99 | - communities_list.sort!{|a, b| a.name <=> b.name} | 100 | + communities_list.sort! {|a, b| a.name.downcase <=> b.name.downcase} |
100 | 101 | ||
101 | if params[:sort] && params[:sort] == "desc" | 102 | if params[:sort] && params[:sort] == "desc" |
102 | communities_list.reverse! | 103 | communities_list.reverse! |
public/style.css
@@ -536,4 +536,9 @@ div#finality textarea { | @@ -536,4 +536,9 @@ div#finality textarea { | ||
536 | 536 | ||
537 | .highlight-error label { | 537 | .highlight-error label { |
538 | color: #FF0000 !important; | 538 | color: #FF0000 !important; |
539 | -} | ||
540 | \ No newline at end of file | 539 | \ No newline at end of file |
540 | +} | ||
541 | + | ||
542 | +/* Fix software catalog list bug(it does not happen in fix_for_beta) */ | ||
543 | +.search-results-type-software_info .search-profile-item { | ||
544 | + width: 100% !important; | ||
545 | +} |