Adjust to search only in the children of software category

- Also fix small break line bug on search option Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>

Adjust to search only in the children of software category
- Also fix small break line bug on search option Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Fabio Teixeira · Gabriela Navarro
1 parent 0b1b40e0
Showing 3 changed files with 13 additions and 2 deletions Show diff stats
lib/ext/category.rb
lib/ext/search_controller.rb
views/search/_catalog_filter.html.erb
@@ -14,9 +14,19 @@ class Category
     _('Education'),
     _('Government and Politics'),
     _('Justice and Legislation'),
-    _('International Relationships')
+    _('International Relationships'),
+    _('Transportation and Transit')
   ]
+  scope :software_categories, lambda {
+    software_category = Category.find_by_name("Software")
+    if software_category.nil?
+      []
+    else
+      software_category.children
+    end
+  }
+
   def software_infos
     software_list = self.communities
     software_list.collect { |x| software_list.delete(x) unless x.software? }
@@ -78,7 +78,7 @@ class SearchController
   def prepare_software_search_page
     @titles[:software_infos] = _("Public Software Catalog")
     @category_filters = []
-    @categories = Category.all
+    @categories = Category.software_categories
     @selected_categories = params[:selected_categories]
     @selected_categories ||= []
     @selected_categories = @selected_categories.map(&:to_i)
@@ -26,6 +26,7 @@
                     <%= _("#{category.name}") %>
           </label> <br>
         <% end %>
+        <br />
       </div>
     </div>
	@@ -14,9 +14,19 @@ class Category		@@ -14,9 +14,19 @@ class Category
14	_('Education'),	14	_('Education'),
15	_('Government and Politics'),	15	_('Government and Politics'),
16	_('Justice and Legislation'),	16	_('Justice and Legislation'),
17	- _('International Relationships')	17	+ _('International Relationships'),
		18	+ _('Transportation and Transit')
18	]	19	]
19		20
		21	+ scope :software_categories, lambda {
		22	+ software_category = Category.find_by_name("Software")
		23	+ if software_category.nil?
		24	+ []
		25	+ else
		26	+ software_category.children
		27	+ end
		28	+ }
		29	+
20	def software_infos	30	def software_infos
21	software_list = self.communities	31	software_list = self.communities
22	software_list.collect { \|x\| software_list.delete(x) unless x.software? }	32	software_list.collect { \|x\| software_list.delete(x) unless x.software? }
	@@ -78,7 +78,7 @@ class SearchController		@@ -78,7 +78,7 @@ class SearchController
78	def prepare_software_search_page	78	def prepare_software_search_page
79	@titles[:software_infos] = _("Public Software Catalog")	79	@titles[:software_infos] = _("Public Software Catalog")
80	@category_filters = []	80	@category_filters = []
81	- @categories = Category.all	81	+ @categories = Category.software_categories
82	@selected_categories = params[:selected_categories]	82	@selected_categories = params[:selected_categories]
83	@selected_categories \|\|= []	83	@selected_categories \|\|= []
84	@selected_categories = @selected_categories.map(&:to_i)	84	@selected_categories = @selected_categories.map(&:to_i)
	@@ -26,6 +26,7 @@		@@ -26,6 +26,7 @@
26	<%= _("#{category.name}") %>	26	<%= _("#{category.name}") %>
27	</label> <br>	27	</label> <br>
28	<% end %>	28	<% end %>
		29	+ <br />
29	</div>	30	</div>
30	</div>	31	</div>
31		32