andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Corrected solr config + minor bugfixes

Browse Source
This commit is contained in:
Andreas Stephanides
2018-09-17 12:05:47 +02:00
parent 1cf84c90ae
commit a20c6fa673
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/document.rb
View File

@@ -72,16 +72,16 @@ class Document < ActiveRecord::Base
unless self.is_etherpad? || self.id.nil?
self.etherpadkey="document_"+ self.id.to_s
if self.text.nill?
if self.text.nil?
self.ep_pad.html = '<div>'+"text"+'</div>'
else
self.ep_pad.html = '<div>'+self.text+'</div>'
end
end
end
end
def dump_to_etherpad
if self.is_etherpad?
if self.text.nill?
if self.text.nil?
self.ep_pad.html = '<div>'+"text"+'</div>'
else
self.ep_pad.html = '<div>'+self.text+'</div>'

2
app/views/home/infoscreen.html.erb
View File

@@ -3,7 +3,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty? %>
<%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
<%= stylesheet_link_tag "infoscreenframe.css" %>
<%= stylesheet_link_tag "/iframe/infoscreenframe.css" %>
<%= javascript_include_tag "application" %>
<%= javascript_include_tag "jmpress" %>