Download as
Browse Code »

Commit 518e52aac056e17dbf8cd1aa7eaf40f5ca88b590

Authored by MoisesMachado
1 parent a263c092
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem140: made the infra for the advanced search 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1096 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 21 additions and 6 deletions   Show diff stats
app/controllers/public/category_controller.rb
  Diff comments   View file @518e52a
... ... @@ -2,12 +2,11 @@ class CategoryController < ApplicationController
2 2  
3 3 before_filter :load_default_enviroment
4 4  
5   -
6 5 #FIXME This is not necessary because the application controller define the envrioment
7 6 # as the default holder
8   -
  7 +
9 8 design :holder => 'environment'
10   -
  9 +
11 10 def load_default_enviroment
12 11 @environment = Environment.default
13 12 end
... ... @@ -26,11 +25,12 @@ class CategoryController < ApplicationController
26 25 send(@category.class.name.underscore.to_sym)
27 26 # TODO: load articles, documents, etc so the view can list them.
28 27 end
29   -
  28 +
30 29 protected
31 30 def product_category
32 31 @products = @category.all_products
33 32 @enterprises = Enterprise.find(:all, :conditions => ['products.id in (?)', @products.map(&:id)], :include => :products)
  33 + @users = Profile.find(:all, :conditions => ['consumptions.product_category_id = (?)',@category.id], :include => :consumptions)
34 34 end
35 35  
36 36 def category
... ...
app/controllers/public/search_controller.rb
  Diff comments   View file @518e52a
... ... @@ -51,4 +51,8 @@ class SearchController < ApplicationController
51 51 @tagged = @tag.taggings.map(&:taggable)
52 52 end
53 53  
  54 + def advanced_search
  55 +
  56 + end
  57 +
54 58 end
... ...
app/views/category/_product_category.rhtml
  Diff comments   View file @518e52a
1   -<%= link_to(_('I consume this'), {:profile => current_user.login, :controller => 'consumed_products', :action => 'new', 'consumption[product_category_id]' => @category.id }, :method => :post) %>
  1 +<%= link_to(_('I consume this'), {:profile => current_user.login, :controller => 'consumed_products', :action => 'new', 'consumption[product_category_id]' => @category.id }, :method => :post) if logged_in? %>
2 2 <ul>
3 3 <li><%= n_("One product in this category.", "%{num} products in this category.", @products.size) % { :num => @products.size } %></li>
4 4 <li><%= n_("One enterprise sells products in this category.", "%{num} enterprises sells products in this category.", @enterprises.size) % { :num => @enterprises.size} %></li>
  5 + <li><%= n_("One user consumes this product.", "%{num} users consumes this product", @users.size) % {:num => @users.size} %></li>
5 6 </ul>
6 7  
  8 +<h3> <%= _('Products under this category:') %> </h3>
7 9 <ul>
8 10 <% @products.each do |p| %>
9 11 <li>
... ... @@ -15,3 +17,12 @@
15 17 </li>
16 18 <% end %>
17 19 </ul>
  20 +
  21 +<h3><%= _('Users that consumes products in this category:') %></h3>
  22 +
  23 +<% @users.each do |u| %>
  24 + <p>
  25 + <%= image_tag u.image.public_filename(:thumb) if u.image %> <br>
  26 + <%= link_to_homepage(u.name, u.identifier) %>
  27 + </p>
  28 +<% end %>
... ...
app/views/profile_editor/change_image.rhtml
  Diff comments   View file @518e52a
1   -<% form_for :image, @image, :html => { :multipart => true }, :url => { :action => 'edit_image_preview'} do |f| %>
  1 +<% form_for :image, @image, :html => { :multipart => true }, :url => { :action => 'change_image'} do |f| %>
2 2 <%= display_form_field(_('Image'), f.file_field( :uploaded_data ) ) %>
3 3 <%= display_submit_tag(_('Upload')) %>
4 4 <%= link_to _('Cancel'), :action => 'index' %>
... ...