Merge branch 'master' of github.com:fetsite/fetsite

app/controllers/galleries_controller.rb

@@ -65,7 +65,11 @@ class GalleriesController < ApplicationController
     @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

app/controllers/rubriken_controller.rb

@@ -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

app/models/ability.rb

@@ -90,7 +90,9 @@ class Ability
     
     #-----------------------------------------------------
     # Rechteverwaltung fuer Neuigkeiten
-    can [:show,:index], Rubrik, :public=>true
+    can :index, Rubrik
+    can [:show], Rubrik, :public=>true
+    can [:list], Neuigkeit, Neuigkeit.public.published
     can :show, Neuigkeit, :rubrik=>{:public=>true}
 
     if loggedin
@@ -101,6 +103,7 @@ class Ability
       can :showintern, Neuigkeit
       can :showintern, Rubrik
       can :seeintern, User
+      can :list, Neuigkeit
       can :shownonpublic, Rubrik
       can :manage, Nlink
     end

app/models/neuigkeit.rb

@@ -28,7 +28,8 @@ class Neuigkeit < ActiveRecord::Base
 
   default_scope  order(:cache_order)
   scope :recent, -> { published.limit(10)}
-  scope :unpublished, -> {where("datum >= ? OR datum IS NULL", Date.today)}
+  scope :unpublished, -> {where("datum > ? OR datum IS NULL", Date.today)}
+  scope :published_scope, ->{where("datum <= ? OR datum IS NULL", Date.today)}
   scope :public, ->{includes(:rubrik).where("rubriken.public"=>true)}
   scope :intern, ->{includes(:rubrik).where("rubriken.public"=>false)}
 

app/views/galleries/show.html.erb

@@ -4,8 +4,10 @@
 <% 
    if @openfotoid.nil? || @openfotoid==0
    @firstfoto= @fotos_p.first
+   unless @firstfoto.nil?
    picture_url=URI(root_url)
    picture_url.path=@firstfoto.datei.url(:locale=>nil, :theme=>nil)
+end
 set_meta_tags :og => {
 :image => picture_url.to_s,
 :title => @gallery.name.to_s,

app/views/rubriken/index.html.erb

@@ -24,7 +24,7 @@
 
       <ul class="unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
 	<% @neuigkeiten.each do |n| %>
-	<li><%= render n if can?(:show, n) %> </li>
+	<li><%= render n  %> </li>
 	<% end %>
       </ul>