bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/fetsite/fetsite

Browse Source
This commit is contained in:
Thomas Blazek
2015-01-14 09:12:56 +01:00
parent 9cc108b2ed 70e34875f1
commit bcffee7bc9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/document.rb
View File

@@ -16,7 +16,7 @@ class Document < ActiveRecord::Base
"document_"+self.id.to_s "document_"+self.id.to_s
end end
def self.ether def self.ether
EtherpadLite.connect('http://www.fet.at/etherpad', File.new('/home/andreas/www/APIKEY.txt')) EtherpadLite.connect('http://www.fet.at/etherpad', File.new('/srv/etherpad/etherpad-lite/APIKEY.txt'))
end end
def ether def ether
if @ep.nil? if @ep.nil?
@@ -48,7 +48,7 @@ class Document < ActiveRecord::Base
self.ep_group.pad(self.etherpadkey) self.ep_group.pad(self.etherpadkey)
end end
def ep_group def ep_group
t= (self.typ.nil?) ? 1 : self.typ t= (self.typ.nil? || self.typ ==0) ? 1 : self.typ
Document.ether.group(Document::TYPS[t]) Document.ether.group(Document::TYPS[t])
end end
searchable do searchable do

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

@@ -13,4 +13,4 @@
</ul> </ul>
<% end %> <% end %>
<%= @res %> <% @res %>