Merge remote-tracking branch 'origin'

app/controllers/documents_controller.rb

@@ -0,0 +1,134 @@
+class DocumentsController < ApplicationController
+# require('etherpad-lite')
+  load_and_authorize_resource
+  def index
+    respond_to do |format|
+      format.html {redirect_to rubriken_path}
+    end
+  end
+  def new
+    @document=Document.new
+    @parent=params[:parent_type].constantize.find(params[:parent_id])
+    @document.parent=@parent
+
+    @document.typ = 1
+    respond_to do |format|
+      format.js
+    end
+  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
+    @document = Document.new(params[:document])
+
+    @parent=@document.parent
+
+    respond_to do |format|
+      if @document.save
+       # format.html { redirect_to @document, notice: 'Document was successfully created.' }
+        #format.json { render json: @document, status: :created, location: @document }
+        format.js
+      else
+    #    format.html { render action: "new" }
+   #     format.json { render json: @document.errors, status: :unprocessable_entity }
+        format.js { render action: "new" }
+      end
+    end
+  end
+
+
+  def update
+    @document = Document.find(params[:id])
+    @parent=@document.parent
+
+    respond_to do |format|
+      if @document.update_attributes(params[:document])
+        format.html { redirect_to @document, notice: 'Document was successfully updated.' }
+        format.json { head :no_content }
+        format.js
+      else
+     #   format.html { render action: "edit" }
+    #    format.json { render json: @document.errors, status: :unprocessable_entity }
+        format.js { render action: "edit"}
+      end
+    end
+  end
+  def destroy
+    logger.info("-------------delete------------------")
+    @document = Document.find(params[:id])
+
+    @parent=@document.parent
+
+    @document_id = params[:id]  
+   
+    @document.destroy
+    
+    respond_to do |format|
+      #format.html { redirect_to @object}
+      #format.json { head :no_content }
+      format.js 
+    end
+  end
+
+
+end

app/controllers/home_controller.rb

@@ -2,7 +2,8 @@ class HomeController < ApplicationController
   def index
     @beispiele = Beispiel.last([Beispiel.count, 3].min)
     @neuigkeiten = Neuigkeit.recent
-
+    t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml")
+    @starttopic= @themen = Thema.where(:id=>t).first
   end
   def dev
 

app/controllers/meetings_controller.rb

@@ -0,0 +1,132 @@
+class MeetingsController < ApplicationController
+
+
+
+
+ # load_and_authorize_resource
+  def index
+    parent=params[:parent_type].constantize.find(params[:parent_id])
+    unless parent.nil?
+      #authorize! :show, parent
+      if params[:filter]=="upcomming"
+        @meetings=parent.meetings.includes(:calentry).where("calentries.start>?",1.hour.ago)
+      else
+      @meetings=parent.meetings
+      end
+      @parent=parent
+    end
+    respond_to do |format|
+      format.html {redirect_to rubriken_path}
+      format.js
+    end
+  end
+  def announce
+    m=Meeting.find(params[:id])
+    m.create_announcement(current_user)
+    m.save
+   
+    respond_to do |format|
+      format.html {redirect_to m.parent}
+      format.js {render action: :show}  
+    end
+  end
+  def show
+    m=Meeting.find(params[:id])
+    respond_to do |format|
+      format.html {redirect_to m.parent}
+      format.js  
+      
+    end
+end
+  def new
+    @meeting=Meeting.new
+    @meeting.parent=params[:parent_type].constantize.find(params[:parent_id])
+    @parent=@meeting.parent
+    @meeting.calentry=Calentry.new
+    @meeting.calentry.typ = 2
+    respond_to do |format|
+      format.js
+    end
+  end
+  def create_protocol
+    @meeting = Meeting.find(params[:id])
+    @meeting.create_protocol
+    @meeting.save
+    respond_to do |format|
+      format.js {render action: :show}
+    end
+  end
+  def create_agenda
+    @meeting = Meeting.find(params[:id])
+    @meeting.create_agenda
+  
+  
+    respond_to do |format|
+      format.js {render action: :show}
+    end
+  end
+  def edit
+    @meeting = Meeting.find(params[:id])
+
+@parent=@meeting.parent    
+respond_to do |format|
+       format.js
+    end
+
+  end
+
+  def create
+    @meeting = Meeting.new(params[:meeting])
+
+    @parent=@meeting.parent
+    #@meeting.assign_attributes(params[:meeting])
+
+    respond_to do |format|
+      if @meeting.save
+       # format.html { redirect_to @meeting, notice: 'Meeting was successfully created.' }
+        #format.json { render json: @meeting, status: :created, location: @meeting }
+        format.js
+      else
+    #    format.html { render action: "new" }
+   #     format.json { render json: @meeting.errors, status: :unprocessable_entity }
+        format.js { render action: "new" }
+      end
+    end
+  end
+
+def update
+
+  @meeting = Meeting.find(params[:id])
+  @parent=@meeting.parent
+    respond_to do |format|
+    if @meeting.update_attributes(params[:meeting])
+        format.html { redirect_to @meeting, notice: 'Meeting was successfully updated.' }
+        format.json { head :no_content }
+        format.js
+      else
+
+     #   format.html 
+    #    format.json { render json: @meeting.errors, status: :unprocessable_entity }
+        format.js { render action: "edit" }
+      end
+    end
+  end
+  def destroy
+    logger.info("-------------delete------------------")
+    @meeting = Meeting.find(params[:id])
+
+    @parent=@meeting.parent
+    @meeting_id = params[:id]  
+    @meeting.destroy
+    
+    respond_to do |format|
+      #format.html { redirect_to @object}
+      #format.json { head :no_content }
+      format.js 
+    end
+  end
+
+
+
+
+end

app/controllers/meetingtyps_controller.rb

@@ -0,0 +1,2 @@
+class MeetingtypsController < ApplicationController
+end

app/controllers/neuigkeiten_controller.rb

@@ -112,13 +112,13 @@ class NeuigkeitenController < ApplicationController
     end   
 
     @calentries1=@neuigkeit.calentries
-    @nlink_search = Neuigkeit::LINKTYPES.clone
+    nlink_search = Neuigkeit::LINKTYPES.clone
+    nlink_search.collect!{|t| t.constantize}
+   # @nlink_search.collect!{|t| t.search(params[:query]).limit(2)}
+    @results= Sunspot.search nlink_search do 
+      fulltext params[:query]
+    end
     
-    @nlink_search.collect!{|t| t.constantize}
-    @nlink_search.collect!{|t| t.search(params[:query]).limit(2)}
-
-
-    @nlink_search.flatten!
     respond_to do |format|
       format.html { render action:"show" }
       format.js

app/controllers/rubriken_controller.rb

@@ -29,7 +29,7 @@ class RubrikenController < ApplicationController
 
     @rubrik = Rubrik.find(params[:id])
     @moderatoren=User.with_role(:newsmoderator,@rubrik)
-    @calentries= @rubrik.calentries
+    @calentries= @rubrik.calendar.calentries
     if can?(:showunpublished, Neuigkeit)
       @neuigkeiten = @rubrik.neuigkeiten.page(params[:page]).per(3)
     else

app/controllers/themen_controller.rb

@@ -11,7 +11,7 @@ class ThemenController < ApplicationController
     @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t("thema.manage"), :path=>verwalten_thema_path(@thema)}]
     @toolbar_elements << [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('thema.edit'), :path=>edit_thema_path(@thema)}]
     @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t('thema.remove'), :path=>thema_path(@thema), :method=>:delete, :confirm=>I18n.t('thema.sure')}
-
+    
     respond_to do |format|
       format.html {
         redirect_to :controller=>'themengruppen', :id=>@thema.themengruppe.id, :action=>:show, :anchor=> "thema_"+params[:id].to_s     
@@ -40,6 +40,11 @@ class ThemenController < ApplicationController
     # @thema.text = @thema.text.sanitize
     render :edit
   end
+  def version 
+    @thema = Thema.find(params[:id])
+    
+  end
+
   def verwalten
     @thema = Thema.find(params[:id])
     @attachment=Attachment.new
@@ -67,7 +72,7 @@ class ThemenController < ApplicationController
   def edit
     @thema = Thema.find(params[:id])
 
-    
+   
     respond_to do |format|
       format.html
       format.js { @themen= @thema.themengruppe.themen }
@@ -107,7 +112,14 @@ class ThemenController < ApplicationController
       format.js
     end
   end
- def attachments
+  def documents
+    @thema = Thema.find(params[:id])
+    @documents=@thema.documents
+    respond_to do |format|
+      format.js
+    end 
+  end
+  def attachments
    @thema = Thema.find(params[:id])
    @attachments=@thema.attachments
    @attachment=Attachment.new