diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb index f91f7d1..6bab7a0 100755 --- a/app/models/neuigkeit.rb +++ b/app/models/neuigkeit.rb @@ -13,7 +13,7 @@ # class Neuigkeit < ActiveRecord::Base - attr_accessible :datum, :text, :title, :rubrik_id, :author_id,:picture, :calentries_attributes, :flag_important + attr_accessible :datum, :text, :title, :rubrik_id, :author_id,:picture,:picture_cache, :calentries_attributes, :flag_important belongs_to :author, :class_name =>'User' belongs_to :rubrik, :class_name =>'Rubrik', :foreign_key => "rubrik_id" has_one :calendar, through: :rubrik diff --git a/app/views/neuigkeiten/_neuigkeit_edit.html.erb b/app/views/neuigkeiten/_neuigkeit_edit.html.erb index 9f127b0..632e127 100644 --- a/app/views/neuigkeiten/_neuigkeit_edit.html.erb +++ b/app/views/neuigkeiten/_neuigkeit_edit.html.erb @@ -30,7 +30,7 @@ <% end %>
<% unless @neuigkeit.picture_robust.big_thumb.to_s.empty? %> -
+


<%= link_to image_tag(@neuigkeit.picture_robust.big_thumb.url),@neuigkeit.picture_robust.try(:url) %> <%= f.input :picture, as: :uploader %> <%= f.hidden_field :picture_cache %> @@ -38,7 +38,7 @@

<% end %> -
+

<%= raw(@neuigkeit.title) %>

diff --git a/app/views/themes/blue2/neuigkeiten/_menu.html.erb b/app/views/themes/blue2/neuigkeiten/_menu.html.erb index 4ca935a..eb81f26 100644 --- a/app/views/themes/blue2/neuigkeiten/_menu.html.erb +++ b/app/views/themes/blue2/neuigkeiten/_menu.html.erb @@ -16,7 +16,7 @@ <%= 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_stack("globe","ban"), unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :remote=>true, class: "btn stacked") if can?(:unpublish, @neuigkeit) && @neuigkeit.published? + <%= link_to(fa_stack("globe","ban"), unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :remote=>true, class: "btn stacked") if can?(:unpublish, @neuigkeit) && @neuigkeit.published? %> <% if @neuigkeit.published? %>