Commit c8bfa35d8e28dc2fa1436d5758ee9affeb2c1a2b
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
Merge branch 'rails3' into rails3_stable
Showing
3 changed files
with
3 additions
and
3 deletions
Show diff stats
app/helpers/application_helper.rb
@@ -671,7 +671,7 @@ module ApplicationHelper | @@ -671,7 +671,7 @@ module ApplicationHelper | ||
671 | 671 | ||
672 | def theme_javascript_ng | 672 | def theme_javascript_ng |
673 | script = File.join(theme_path, 'theme.js') | 673 | script = File.join(theme_path, 'theme.js') |
674 | - if File.join(Rails.root, 'public', script) | 674 | + if File.exists?(File.join(Rails.root, 'public', script)) |
675 | javascript_include_tag script | 675 | javascript_include_tag script |
676 | else | 676 | else |
677 | nil | 677 | nil |
app/models/person_notifier.rb
@@ -82,7 +82,7 @@ class PersonNotifier | @@ -82,7 +82,7 @@ class PersonNotifier | ||
82 | @url = @profile.environment.top_url | 82 | @url = @profile.environment.top_url |
83 | mail( | 83 | mail( |
84 | content_type: "text/html", | 84 | content_type: "text/html", |
85 | - from: "#{@profile.environment.name} <#{@profile.environment.contact_email}>", | 85 | + from: "#{@profile.environment.name} <#{@profile.environment.noreply_email}>", |
86 | to: @profile.email, | 86 | to: @profile.email, |
87 | subject: _("[%s] Network Activity") % [@profile.environment.name] | 87 | subject: _("[%s] Network Activity") % [@profile.environment.name] |
88 | ) | 88 | ) |
plugins/display_content/lib/display_content_block.rb
@@ -120,7 +120,7 @@ class DisplayContentBlock < Block | @@ -120,7 +120,7 @@ class DisplayContentBlock < Block | ||
120 | nodes_conditions = nodes.blank? ? '' : " AND articles.id IN(:nodes) " | 120 | nodes_conditions = nodes.blank? ? '' : " AND articles.id IN(:nodes) " |
121 | nodes_conditions += ' OR articles.parent_id IN(:nodes) ' if !nodes.blank? && display_folder_children | 121 | nodes_conditions += ' OR articles.parent_id IN(:nodes) ' if !nodes.blank? && display_folder_children |
122 | 122 | ||
123 | - docs = owner.articles.find(:all, :conditions => ["articles.type IN(:types) #{nodes.blank? ? '' : nodes_conditions}", {:nodes => self.nodes, :types => self.types}], :include => :profile) | 123 | + docs = owner.articles.find(:all, :conditions => ["articles.type IN(:types) #{nodes.blank? ? '' : nodes_conditions}", {:nodes => self.nodes, :types => self.types}], :include => [:profile, :image, :tags]) |
124 | proc do | 124 | proc do |
125 | block.block_title(block.title) + | 125 | block.block_title(block.title) + |
126 | content_tag('ul', docs.map {|item| | 126 | content_tag('ul', docs.map {|item| |