Commit 08bd677a5012b2a6e6c0162415a483627d6a5615
1 parent
ac0ab274
Exists in
master
and in
5 other branches
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
7 additions
and
3 deletions
Show diff stats
lib/ext/search_controller.rb
@@ -14,11 +14,10 @@ class SearchController | @@ -14,11 +14,10 @@ class SearchController | ||
14 | def software_infos | 14 | def software_infos |
15 | prepare_software_search_page | 15 | prepare_software_search_page |
16 | results = filter_software_infos_list | 16 | results = filter_software_infos_list |
17 | + @software_count = results.count | ||
17 | results = results.paginate(:per_page => @per_page, :page => params[:page]) | 18 | results = results.paginate(:per_page => @per_page, :page => params[:page]) |
18 | @searches[@asset] = {:results => results} | 19 | @searches[@asset] = {:results => results} |
19 | @search = results | 20 | @search = results |
20 | - @software_count = filter_software_infos_list.count | ||
21 | - | ||
22 | 21 | ||
23 | render :layout=>false if request.xhr? | 22 | render :layout=>false if request.xhr? |
24 | end | 23 | end |
@@ -89,7 +88,7 @@ class SearchController | @@ -89,7 +88,7 @@ class SearchController | ||
89 | end | 88 | end |
90 | 89 | ||
91 | def sort_communities_list communities_list | 90 | def sort_communities_list communities_list |
92 | - communities_list.sort!{|a, b| a.name <=> b.name} | 91 | + communities_list.sort! {|a, b| a.name.downcase <=> b.name.downcase} |
93 | 92 | ||
94 | if params[:sort] && params[:sort] == "desc" | 93 | if params[:sort] && params[:sort] == "desc" |
95 | communities_list.reverse! | 94 | communities_list.reverse! |
public/style.css
@@ -126,3 +126,8 @@ | @@ -126,3 +126,8 @@ | ||
126 | cursor: pointer; | 126 | cursor: pointer; |
127 | margin-left: 5px; | 127 | margin-left: 5px; |
128 | } | 128 | } |
129 | + | ||
130 | +/* Fix software catalog list bug(it does not happen in fix_for_beta) */ | ||
131 | +.search-results-type-software_info .search-profile-item { | ||
132 | + width: 100% !important; | ||
133 | +} |