Download as
Browse Code »

Commit 431b4eb6261b1897c34d443633a9bb36dea71213

Authored by Tallys Martins
1 parent 4078ca33
Exists in master and in 24 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_list_style_on_folder_elements, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, lxc_settings, mezuro_cookbook, refactor_download_block, remove_broken_theme, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, update_search_by_categories

Add custom catalog to categories and tags block 

Signed-off-by: Omar Junior <omarroinuj@gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
Showing 3 changed files with 9 additions and 1 deletions   Show diff stats
src/noosfero-spb/software_communities/lib/categories_and_tags_block.rb
  Diff comments   View file @431b4eb
1 class CategoriesAndTagsBlock < Block 1 class CategoriesAndTagsBlock < Block
2 2
3 attr_accessible :show_name 3 attr_accessible :show_name
  4 + attr_accessible :search_catalog
4 5
5 settings_items :show_name, :type => :boolean, :default => false 6 settings_items :show_name, :type => :boolean, :default => false
  7 + settings_items :search_catalog, :type => :string, :default => SearchController.catalog_list[:public_software].last
6 8
7 def self.description 9 def self.description
8 _('Categories and Tags') 10 _('Categories and Tags')
src/noosfero-spb/software_communities/views/blocks/categories_and_tags.html.erb
  Diff comments   View file @431b4eb
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 3
4 <div class="category_cloud"> 4 <div class="category_cloud">
5 <% block.owner.categories.each do |category| %> 5 <% block.owner.categories.each do |category| %>
6 - <%= link_to category.name, {:controller => :search, :action => :software_infos, :selected_categories_id => [category.id], :software_type => 'all'}, :id => "select-category-1-link", :class => "select-subcategory-link", :target => "_blank" %> 6 + <%= link_to category.name, {:controller => :search, :action => block.search_catalog, :selected_categories_id => [category.id], :software_type => 'all'}, :id => "select-category-1-link", :class => "select-subcategory-link", :target => "_blank" %>
7 <% end %> 7 <% end %>
8 </div><!-- end class='category_cloud' --> 8 </div><!-- end class='category_cloud' -->
9 <% end %> 9 <% end %>
src/noosfero-spb/software_communities/views/box_organizer/_categories_and_tags_block.html.erb 0 → 100644
  Diff comments   View file @431b4eb
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +<div id='edit-search-block' class="formfieldline">
  2 + <% catalog_list = SearchController.catalog_list.collect{|i,v| v} %>
  3 +
  4 + <label class="formlabel"><%= _("Catalog: ") %></label>
  5 + <%= select 'block', 'search_catalog', catalog_list %>
  6 +</div>