bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

rechte für actions versions neuigkeiten

Browse Source
This commit is contained in:
Andreas Stephanides
2014-10-19 19:49:33 +02:00
parent ad751c0837
commit 7436c5c01e
6 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/neuigkeiten_controller.rb
View File

@@ -15,8 +15,8 @@ class NeuigkeitenController < ApplicationController
else
@rubriken = Rubrik.where(:public=>true)
end
if !params[:version].nil?
if !params[:version].nil? && can?(:showversions, Neuigkeit)
@neuigkeit.assign_attributes(@neuigkeit.translation.versions.reverse[params[:version].to_i].reify.attributes.select{|k,v| @neuigkeit.translated_attribute_names.include? k.to_sym })
end
@calentries1=@neuigkeit.calentries
@@ -192,12 +192,13 @@ actions << {:hicon=>'icon-facebook', :text=> I18n.t('neuigkeit.publishfetmail'),
@toolbar_elements << {:text=>I18n.t('common.edit'),:path=>edit_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:icon=>:pencil} if can? :edit, @neuigkeit.rubrik
if can?(:showversions, Neuigkeit)
@versions= @neuigkeit.translation.versions.select([:created_at]).reverse
@toolbar_elements <<{:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:method=>:versions,:versions=>@versions}
end
actions << {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :method=> :delete,:confirm=>'Sure?' } if can? :delete, @neuigkeit
@toolbar_elements << {:text => "action", :method => :dropdown, :elements=> actions}
@toolbar_elements << {:text => "action", :method => :dropdown, :elements=> actions} unless actions.empty?
end

4
app/controllers/themen_controller.rb
View File

@@ -38,7 +38,7 @@ class ThemenController < ApplicationController
# #
#
# @thema.text = @thema.text.sanitize
render :show
render :edit
end
def verwalten
@thema = Thema.find(params[:id])
@@ -46,6 +46,8 @@ class ThemenController < ApplicationController
@fragen=@thema.fragen
@toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('thema.edit'), :path=>edit_thema_path(@thema)}]
@toolbar_elements <<{ :hicon=>'icon-leaf', :text=>"Sanitize", :path=>sanitize_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')}
end