diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb
index f6d7651..4c117d3 100755
--- a/app/controllers/neuigkeiten_controller.rb
+++ b/app/controllers/neuigkeiten_controller.rb
@@ -59,19 +59,34 @@ class NeuigkeitenController < ApplicationController
@neuigkeit = Neuigkeit.find(params[:id])
@neuigkeit.reverse_publish
@neuigkeit.save
+
+ @questions = @neuigkeit.questions.accessible_by(current_ability,:show)
+
if params[:verwalten]
redirect_to verwalten_rubrik_path(@neuigkeit.rubrik)
+ else
+ respond_to do |format|
+ format.html { redirect_to rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)}
+ format.js { render partial: "show"}
end
- redirect_to rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)
+end
+
end
def publish
@neuigkeit = Neuigkeit.find(params[:id])
@neuigkeit.publish
@neuigkeit.save
- if params[:verwalten]
+
+ @questions = @neuigkeit.questions.accessible_by(current_ability,:show)
+
+ if params[:verwalten]
redirect_to verwalten_rubrik_path(@neuigkeit.rubrik)
+else
+ respond_to do |format|
+ format.html { redirect_to rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)}
+ format.js { render partial: "show"}
end
- redirect_to rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)
+end
end
def publish_to_facebook
@neuigkeit = Neuigkeit.find(params[:id])
diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb
index e46d204..f91f7d1 100755
--- a/app/models/neuigkeit.rb
+++ b/app/models/neuigkeit.rb
@@ -167,6 +167,7 @@ class Neuigkeit < ActiveRecord::Base
end
self.update_column(:cache_is_published, self.published?)
end
+
private
def sanitize
self.calentries.each do |calentry|
diff --git a/app/views/themes/blue2/neuigkeiten/_menu.html.erb b/app/views/themes/blue2/neuigkeiten/_menu.html.erb
index 7932c57..74123da 100644
--- a/app/views/themes/blue2/neuigkeiten/_menu.html.erb
+++ b/app/views/themes/blue2/neuigkeiten/_menu.html.erb
@@ -1,28 +1,57 @@