document/meeting updates
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
class DocumentsController < ApplicationController
|
||||
|
||||
# require('etherpad-lite')
|
||||
load_and_authorize_resource
|
||||
def index
|
||||
respond_to do |format|
|
||||
@@ -18,13 +18,64 @@ class DocumentsController < ApplicationController
|
||||
end
|
||||
def edit
|
||||
@document = Document.find(params[:id])
|
||||
|
||||
@parent=@document.parent
|
||||
|
||||
respond_to do |format|
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
def dump_to_etherpad
|
||||
@document = Document.find(params[:id])
|
||||
@document.dump_to_etherpad
|
||||
@document.save
|
||||
# author = ether.author('author_1')
|
||||
# pad=group.pad(@document.etherpadkey)
|
||||
# pad.html='<div>'+@document.text+'</div>'
|
||||
redirect_to action: :show
|
||||
end
|
||||
def read_from_etherpad
|
||||
@document = Document.find(params[:id])
|
||||
@document.read_from_etherpad
|
||||
@document.save
|
||||
render :show
|
||||
end
|
||||
|
||||
def write_etherpad
|
||||
@document = Document.find(params[:id])
|
||||
|
||||
ether=Document.ether
|
||||
author = Document.ether.author("fetsite_"+current_user.uid, :name => current_user.text)
|
||||
author = Document.ether.author("author_1")
|
||||
session[:ep_sessions]={} if session[:ep_sessions].nil?
|
||||
group=@document.ep_group
|
||||
|
||||
sess = session[:ep_sessions][group.id] ? ether.get_session(session[:ep_sessions][group.id]) : group.create_session(author, 60)
|
||||
|
||||
if sess.expired?
|
||||
sess.delete
|
||||
sess = group.create_session(author, 60)
|
||||
end
|
||||
session[:ep_sessions][group.id] = sess.id
|
||||
# Set the EtherpadLite session cookie. This will automatically be picked up by the jQuery plugin's iframe.
|
||||
|
||||
cookies[:sessionID] = {:value => sess.id, :domain => "www.fet.at"}
|
||||
#cookies[:sessionID] = {:value => sess.id}
|
||||
cookies[:sessionID1]=sess.id
|
||||
# cookies[:sdf]=sess.id
|
||||
# pad=ether.pad(@document.etherpadkey)
|
||||
# redirect_to "http://www.fet.at/etherpad/p/"+@document.ep_pad.id
|
||||
#render :write
|
||||
end
|
||||
def write
|
||||
@document = Document.find(params[:id])
|
||||
if @document.is_etherpad?
|
||||
redirect_to action: :write_etherpad
|
||||
else
|
||||
@parent=@document.parent
|
||||
respond_to do |format|
|
||||
format.html
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def create
|
||||
|
||||
Reference in New Issue
Block a user