AutoCommit Fre Aug 21 23:03:02 CEST 2015

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])

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|

app/views/themes/blue2/neuigkeiten/_menu.html.erb

@@ -1,28 +1,57 @@
 <div class="toolbar-inline">
-	<%= link_to(fa_icon("edit"), edit_rubrik_neuigkeit_path( @neuigkeit.rubrik,  @neuigkeit), remote: true , class: "btn", title: "Edit") if can? :edit, @neuigkeit %>
+	<%= link_to(fa_icon("edit"), edit_rubrik_neuigkeit_path( @neuigkeit.rubrik,  @neuigkeit), remote: true , class: "btn", title: "Edit") if can? :edit, @neuigkeit 
+	%>
 	<span class="btn-group">
-		<%= link_to fa_icon("paperclip"), "#", class: "btn", id: "attachments-form-open", title: "Attachments" if can? :edit, @neuigkeit %>	
+		<%= link_to(fa_icon("paperclip"), "#", \ 
-		<%= link_to fa_icon("calendar-o"),  new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true, class: :btn if can? :edit, @neuigkeit %>
+								class: "btn", id: "attachments-form-open", title: "Attachments") \ 
-
+									if can? :edit, @neuigkeit 
+		%>	
+		<%= link_to(fa_icon("calendar-o"), \
+								new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), \
+								:remote=>true, class: :btn) \
+									if can? :edit, @neuigkeit 
+		%>
+		<%= link_to(fa_icon("link") , "#", \ 
+								id: "findlink-open",title: "Neue Verknüpfung" , class: "btn") \
+									if can? :find_link, @neuigkeit 
+		%>
+		
 	</span>
-
+	
 	<%= new_question_for(@neuigkeit, fa_icon("question")) if can? :new, Survey::Question %>
+ 
 	<span class=" pull-right">
-		<%= (link_to(fa_icon("globe"), publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), title:  I18n.t('neuigkeit.publish'), class: "btn") ) if can?(:publish, @neuigkeit) && !@neuigkeit.published? %>
+		<%= link_to(fa_icon("globe"), \ 
-		<%= link_to fa_stack("globe","ban"), "#", :remote=>true, class: "btn stacked" if can? :edit, @neuigkeit %>
+								publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), \
-
+								title:  I18n.t('neuigkeit.publish'), class: "btn") \
-		<div class="dropdown" style=" display:inline"">
+									if can?(:publish, @neuigkeit) && !@neuigkeit.published? 
-			<a class="dropdown-toggle btn" data-toggle="dropdown" title="publish" href="#"><%= fa_icon("mail-forward")%><span class="caret"></span></a>
+		%>
-			<ul class="dropdown-menu">
+		<%= link_to (fa_stack("globe","ban"), \ 
-				<%= li_tag(link_to(fa_icon("facebook-square") + " post on facebook", publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)))  if can?(:publish, @neuigkeit) && @neuigkeit.published? %>
+								 unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), \
-
+								 :remote=>true, class: "btn stacked") \
-				<%= li_tag(link_to(fa_icon("envelope-o") + " send mail", mail_to_fet_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)))  if can?(:publish, @neuigkeit) && @neuigkeit.published? %>
+									 if  can?(:unpublish, @neuigkeit) && @neuigkeit.published? 
-			</ul>
+		%>
-		</div>
+		<% if @neuigkeit.published? %>
+			<div class="dropdown" style=" display:inline"">
+				<a class="dropdown-toggle btn" data-toggle="dropdown" title="publish" href="#">
+					<%= fa_icon("mail-forward")%><span class="caret"></span>
+				</a>
+				<ul class="dropdown-menu">
+					<%= li_tag(link_to(fa_icon("facebook-square") + " post on facebook", \
+														 publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) \
+														 if can?(:publish, @neuigkeit) && @neuigkeit.published? 
+					%>
+					
+					<%= li_tag(link_to(fa_icon("envelope-o") + " send mail", \
+														 mail_to_fet_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)))  \ 
+														 if can?(:publish, @neuigkeit) && @neuigkeit.published? 
+					%>
+				</ul>
+			</div>
+		<% end  %>
 	</span>
 	<div class="ui-dialog" id="attachments-form">
 		<%= render_new_attachments_for(@neuigkeit, fa_icon("plus"), {class: "btn"})  %>
-
 	</div>
 </div>
 <script>

app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb

@@ -4,13 +4,15 @@
 	<%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
   
 	<div>
+<% cache() do %>
 		<%= render partial: "menu" %>		
+<%  end %>
 	</div>  
 	<div>
 
-		<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
+		<%#= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
 	</div>
-	<br>	<div class="media">
+		<div class="media">
 	  <span itemprop="articleSection">
 			<%= ff_icon(neuigkeit_view.rubrik.icon) unless neuigkeit_view.rubrik.icon.nil? or neuigkeit_view.rubrik.icon.empty? %>&nbsp;<%= neuigkeit_view.rubrik.name %>
     </span>