andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

fix neuigkeiten

Browse Source
This commit is contained in:
Andreas Stephanides
2015-03-03 18:12:22 +01:00
parent 8718a77e4f
commit 0d6e11299a
6 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/galleries_controller.rb
View File

@@ -63,9 +63,13 @@ class GalleriesController < ApplicationController
@toolbar_elements << {:hicon=>'icon-pencil', :text => I18n.t('common.edit'), :path=>edit_gallery_path(@gallery)} if can? :edit, @gallery
@toolbar_elements << {:hicon=>'icon-arrow-left', :text=>I18n.t('common.back'), :path=>galleries_path()}
@toolbar_elements << {:hicon => 'icon-remove-circle', :text => I18n.t('common.delete'), :path => gallery_path(@gallery),:confirm=>'Sure?', :method=>:delete} if can? :delete, Gallery
respond_to do |format|
format.html # show.html.erb
format.html {
if @fotos.nil? || @fotos.empty?
redirect_to new_gallery_foto_path(@gallery)
end
}
format.json { render json: @gallery }
end
end

4
app/controllers/rubriken_controller.rb
View File

@@ -11,7 +11,7 @@ class RubrikenController < ApplicationController
# end
@rubriken= Rubrik.accessible_by(current_ability, :show)
@neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).page(params[:page]).per(3)
@neuigkeiten = Neuigkeit.accessible_by(current_ability, :list).page(params[:page]).per(3)
@calentries= (@rubriken.map {|r| r.calendar}).collect(&:calentries).flatten.select {|c| c.object !=nil}
respond_to do |format|
@@ -29,7 +29,7 @@ class RubrikenController < ApplicationController
@moderatoren=User.with_role(:newsmoderator,@rubrik)
@calentries= @rubrik.calendar.calentries.select {|c| c.object !=nil}
@neuigkeiten = @rubrik.neuigkeiten.accessible_by(current_ability, :show).page(params[:page]).per(3)
@neuigkeiten = @rubrik.neuigkeiten.accessible_by(current_ability, :list).page(params[:page]).per(3)
@toolbar_elements << {:text=>I18n.t('neuigkeit.new.title'), :path=> new_rubrik_neuigkeit_path(@rubrik),:hicon=>'icon-plus-sign'} if can? :verwalten, @rubrik
@toolbar_elements << {:text=>I18n.t('common.verwalten'), :path=>verwalten_rubrik_path(@rubrik),:icon=>:pencil} if can? :verwalten, @rubrik