Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rss images and email images #2784

Merged
merged 6 commits into from
Jun 7, 2018
+17 −19
Merged

Fix rss images and email images #2784

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bbcdc79
Fix rss images and email images
jywarren Jun 7, 2018
0bff3dc
Update rss.rss.builder
jywarren Jun 7, 2018
efa62e4
Update rss_for_tagged_with_author.rss.builder
jywarren Jun 7, 2018
21cc123
Update rss.rss.builder
jywarren Jun 7, 2018
b9579fc
Update rss.rss.builder
jywarren Jun 7, 2018
045e442
Update notify_node_creation.html.erb
jywarren Jun 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix rss images and email images
@jywarren
jywarren authored Jun 7, 2018
commit bbcdc79fc81cf7250f472b36b45f053a53fdc76e
2 changes: 1 addition & 1 deletion app/views/notes/rss.rss.builder
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ xml.rss :version => '2.0', 'xmlns:atom' => 'http://www.w3.org/2005/Atom' do
body = auto_link(body, sanitize: false)
body = "<p><a href='https://#{ActionMailer::Base.default_url_options[:host]}/moderate/publish/#{@node.id}'>Approve</a> or <a href='https://#{ActionMailer::Base.default_url_options[:host]}/moderate/spam/<%= node.id %>'>Spam</a></p>" + body if node.status == 4
if node.main_image
xml.description { xml.cdata!("<img src='#{node.main_image.path(:default)}' alt='#{node.main_image.title}'> <br />" + body) }
xml.description { xml.cdata!("<img src='https://#{ActionMailer::Base.default_url_options[:host]}#{node.main_image.path(:default)}' alt='#{node.main_image.title}'> <br />" + body) }
else
xml.description { xml.cdata!("<img src='https://publiclab.org/system/images/photos/000/023/444/original/Screenshot_20180204-101546_2.png' alt='PublicLab'> <br />" + body) }
end