Download as
Browse Code »

Commit df6d28640a93c933b8d2866546306a1a968e1cdf

Authored by Rodrigo Souto
1 parent 07f9167d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Including a link to the start of the catalog on catalog categories left block

Showing 4 changed files with 17 additions and 4 deletions   Show diff stats
app/models/enterprise.rb
  Diff comments   View file @df6d286
@@ -185,4 +185,8 @@ class Enterprise < Organization @@ -185,4 +185,8 @@ class Enterprise < Organization
185 Scrap.find_by_sql("SELECT id, updated_at, 'Scrap' AS klass FROM scraps WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, 'ActionTracker::Record' AS klass FROM action_tracker WHERE action_tracker.target_id = #{self.id} UNION SELECT action_tracker.id, action_tracker.updated_at, 'ActionTracker::Record' AS klass FROM action_tracker INNER JOIN articles ON action_tracker.target_id = articles.id WHERE articles.profile_id = #{self.id} AND action_tracker.target_type = 'Article' ORDER BY action_tracker.updated_at DESC") 185 Scrap.find_by_sql("SELECT id, updated_at, 'Scrap' AS klass FROM scraps WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, 'ActionTracker::Record' AS klass FROM action_tracker WHERE action_tracker.target_id = #{self.id} UNION SELECT action_tracker.id, action_tracker.updated_at, 'ActionTracker::Record' AS klass FROM action_tracker INNER JOIN articles ON action_tracker.target_id = articles.id WHERE articles.profile_id = #{self.id} AND action_tracker.target_type = 'Article' ORDER BY action_tracker.updated_at DESC")
186 end 186 end
187 187
  188 + def catalog_url
  189 + { :profile => identifier, :controller => 'catalog'}
  190 + end
  191 +
188 end 192 end
app/views/catalog/index.rhtml
  Diff comments   View file @df6d286
@@ -7,7 +7,8 @@ @@ -7,7 +7,8 @@
7 7
8 <div class='l-sidebar-left-bar'> 8 <div class='l-sidebar-left-bar'>
9 <ul> 9 <ul>
10 - <%= content_tag('li', link_to(_('Enterprise homepage'), profile.public_profile_url), :id => 'catalog-categories-homepage-link') %> 10 + <%= content_tag('li', link_to(_('Enterprise homepage'), profile.public_profile_url), :class => 'catalog-categories-link') %>
  11 + <%= content_tag('li', link_to(_('Catalog start'), profile.catalog_url), :class => 'catalog-categories-link') %>
11 <% if @categories.present? %> 12 <% if @categories.present? %>
12 <% @categories.each do |category| %> 13 <% @categories.each do |category| %>
13 <%= category_link(category) %> 14 <%= category_link(category) %>
public/stylesheets/application.css
  Diff comments   View file @df6d286
@@ -2723,7 +2723,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation @@ -2723,7 +2723,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
2723 padding-bottom: 0.5em; 2723 padding-bottom: 0.5em;
2724 } 2724 }
2725 2725
2726 -#catalog-categories-homepage-link { 2726 +.l-sidebar-left-bar .catalog-categories-link {
2727 background-color: #d3d7cf; 2727 background-color: #d3d7cf;
2728 font-weight: bold; 2728 font-weight: bold;
2729 height: 28px; 2729 height: 28px;
@@ -2733,12 +2733,12 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation @@ -2733,12 +2733,12 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
2733 } 2733 }
2734 2734
2735 2735
2736 -#catalog-categories-homepage-link:hover { 2736 +.l-sidebar-left-bar .catalog-categories-link:hover {
2737 background-color: #babdb6; 2737 background-color: #babdb6;
2738 } 2738 }
2739 2739
2740 2740
2741 -#catalog-categories-homepage-link a{ 2741 +.l-sidebar-left-bar .catalog-categories-link a{
2742 display: inline-block; 2742 display: inline-block;
2743 height: 100%; 2743 height: 100%;
2744 width: 100%; 2744 width: 100%;
test/unit/enterprise_test.rb
  Diff comments   View file @df6d286
@@ -523,4 +523,12 @@ class EnterpriseTest &lt; ActiveSupport::TestCase @@ -523,4 +523,12 @@ class EnterpriseTest &lt; ActiveSupport::TestCase
523 assert_not_includes enterprise.activities.map { |a| a.klass.constantize.find(a.id) }, article.activity 523 assert_not_includes enterprise.activities.map { |a| a.klass.constantize.find(a.id) }, article.activity
524 end 524 end
525 525
  526 + should 'provide URL to catalog area' do
  527 + environment = create_environment('mycolivre.net')
  528 + enterprise = build(Enterprise, :identifier => 'testprofile', :environment_id => create_environment('mycolivre.net').id)
  529 +
  530 + assert_equal({:profile => enterprise.identifier, :controller => 'catalog'}, enterprise.catalog_url)
  531 + end
  532 +
  533 +
526 end 534 end