diff --git a/app/models/project.rb b/app/models/project.rb index a54e1ab0..b6bc6ef7 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -40,10 +40,6 @@ def description_html CustomRender.render_markdown(self, :description) end - def notes_html - CustomRender.render_markdown(self, :notes) - end - # Define filter api settings def self.filter_settings { @@ -60,7 +56,6 @@ def self.filter_settings project_hash[:site_ids] = fresh_project.nil? ? nil : fresh_project.sites.pluck(:id).flatten project_hash[:description_html]= fresh_project.description_html - project_hash[:notes_html] = fresh_project.notes_html [item, project_hash] }, diff --git a/app/models/site.rb b/app/models/site.rb index a004b52e..d246b614 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -109,15 +109,10 @@ def update_location_obfuscated(current_user) @location_obfuscated = !is_owner end - # I don't know why Rubymine complains about Kramdown where ever I use it... def description_html CustomRender.render_markdown(self, :description) end - def notes_html - CustomRender.render_markdown(self, :notes) - end - def self.add_location_jitter(value, min, max) # multiply by 10,000 to get to ~10m accuracy @@ -192,8 +187,7 @@ def self.filter_settings custom_latitude: fresh_site.latitude, custom_longitude: fresh_site.longitude, timezone_information: TimeZoneHelper.info_hash(fresh_site), - description_html: fresh_site.description_html, - notes_html: fresh_site.notes_html + description_html: fresh_site.description_html } end diff --git a/lib/modules/custom_render.rb b/lib/modules/custom_render.rb index 40418395..64d12115 100644 --- a/lib/modules/custom_render.rb +++ b/lib/modules/custom_render.rb @@ -3,6 +3,7 @@ class << self def render_markdown(model, attribute) value = model[attribute] is_blank = value.blank? + # I don't know why Rubymine complains about Kramdown not being found... is_blank ? nil : ApplicationController.helpers.sanitize(Kramdown::Document.new(value).to_html) end end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 73bded14..0cf4073d 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -24,16 +24,13 @@ expect(FactoryGirl.create(:project, created_at: nil)).not_to be_a_new(Project) end - it 'generates html for description and notes' do + it 'generates html for description' do md = "# Header\r\n [a link](https://github.com)." html = "

Header

\n

a link.

\n" - projectHtml = FactoryGirl.create(:project, description: md, notes: md) + projectHtml = FactoryGirl.create(:project, description: md) expect(projectHtml.description).to eq(md) expect(projectHtml.description_html).to eq(html) - - expect(projectHtml.notes).to eq(md) - expect(projectHtml.notes_html).to eq(html) end # this should pass, but the paperclip implementation of validate_attachment_content_type is buggy. diff --git a/spec/models/site_spec.rb b/spec/models/site_spec.rb index 3eb6972e..3f9101c1 100644 --- a/spec/models/site_spec.rb +++ b/spec/models/site_spec.rb @@ -103,16 +103,14 @@ }.to raise_error(CustomErrors::OrphanedSiteError) end - it 'generates html for description and notes' do + it 'generates html for description' do md = "# Header\r\n [a link](https://github.com)." html = "

Header

\n

a link.

\n" - projectHtml = FactoryGirl.create(:site, description: md, notes: md) + projectHtml = FactoryGirl.create(:site, description: md) expect(projectHtml.description).to eq(md) expect(projectHtml.description_html).to eq(html) - expect(projectHtml.notes).to eq(md) - expect(projectHtml.notes_html).to eq(html) end it 'should error on invalid timezone' do