diff --git a/app/models/document.rb b/app/models/document.rb index e5260f9..621fa67 100644 --- a/app/models/document.rb +++ b/app/models/document.rb @@ -10,7 +10,7 @@ class Document < ActiveRecord::Base has_paper_trail TYPS = { 1=>"fet_docs", 10=>"protocol", 11=> "agenda"} has_many :attachments, :as=>:parent - def long_name + def long_name if self.parent.class=="Meeting" ""+self.parent.text+ ""+ self.name else @@ -18,20 +18,20 @@ class Document < ActiveRecord::Base end end def self.new_divid_for(parent) - "document_new_parent_" + parent.class.to_s + "_" + parent.id.to_s + "document_new_parent_" + parent.class.to_s + "_" + parent.id.to_s end def divid "document_"+self.id.to_s end def self.ether - EtherpadLite.connect('https://www.etherpad.fet.at', File.new('config/etherpad/APIKEY.txt')) + EtherpadLite.connect('https://www.fet.at/etherpad', File.new('config/etherpad/APIKEY.txt'))#https://www.etherpad.fet.at end def create_pdf require "open3" - + #url=blank_document_url({id: self.id, host: host, port: port}) # url=Rails.application.routes.url_helpers.blank_document_url({id: self.id, host: host, port: port}) - + file = Tempfile.new(['document', '.pdf']) bin=Rails.application.config.pdf_bin sin,sout,serr=Open3.popen3("#{bin} --header-html \"file://#{Rails.root}/app/views/documents/header.html\" --footer-html \"file://#{Rails.root}/app/views/documents/footer.html\" --replace title1 \"#{self.name}\" - #{file.path}") @@ -70,9 +70,9 @@ class Document < ActiveRecord::Base end def move_to_etherpad unless self.is_etherpad? || self.id.nil? - self.etherpadkey="document_"+ self.id.to_s + self.etherpadkey="document_"+ self.id.to_s self.ep_pad.html = '