[Git][noosfero/noosfero][stable-1.7] Merge branch 'enterprise_products' into 'master'

[Rodrigo Souto]

Rodrigo Souto pushed to branch stable-1.7 at Noosfero / noosfero


Commits:
c37d9b40 by Rodrigo Souto at 2017-01-23T19:45:41+00:00
Merge branch 'enterprise_products' into 'master'

Fixes catalog link in enterprise profile page

Closes #244

See merge request !1096
- - - - -


1 changed file:

- app/helpers/profile_helper.rb


Changes:

=====================================
app/helpers/profile_helper.rb
=====================================
--- a/app/helpers/profile_helper.rb
+++ b/app/helpers/profile_helper.rb
@@ -17,7 +17,7 @@ module ProfileHelper
   ORGANIZATION_CATEGORIES = {}
   ORGANIZATION_CATEGORIES[:basic_information] = [:display_name, :created_at, :foundation_year, :type, :language, :members_count, :location, :address_reference, :historic_and_current_context, :admins]
   ORGANIZATION_CATEGORIES[:contact] = [:contact_person, :contact_phone, :contact_email, :organization_website, :jabber_id]
-  ORGANIZATION_CATEGORIES[:economic] = [:business_name, :acronym, :economic_activity, :legal_form, :products, :activities_short_description, :management_information]
+  ORGANIZATION_CATEGORIES[:economic] = [:business_name, :acronym, :economic_activity, :legal_form, :activities_short_description, :management_information]
   ORGANIZATION_CATEGORIES.merge!(COMMON_CATEGORIES)
 
   CATEGORY_MAP = {}
@@ -127,12 +127,6 @@ module ProfileHelper
     link_to count, :controller => 'profile', :action => 'members'
   end
 
-  def treat_products(products)
-    if profile.kind_of?(Enterprise) && profile.environment.enabled?('products_for_enterprises')
-      link_to _('Products/Services'), :controller => 'catalog', :action => 'index'
-    end
-  end
-
   def treat_admins(admins)
     profile.admins.map { |admin| link_to(admin.short_name, admin.url)}.join(', ')
   end



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/c37d9b406c3388a526faa572ecd64d1e5353440c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170123/e1d85d39/attachment-0001.html>