diff --git a/app/models/ability.rb b/app/models/ability.rb index f9388ae..38a73c6 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -67,7 +67,10 @@ class Ability if user.has_role?("newsadmin") || user.has_role?("fetadmin") can :addmoderator, Rubrik end - can [:show, :index], [Rubrik,Neuigkeit] + can [:show,:index], Rubrik, :public=>true + + can :show, Neuigkeit, :rubrik=>{:public=>true} + if user.has_role?("newsadmin") || user.has_role?( "fetadmin") || user.has_role?( "fetuser") can :manage, Rubrik can :manage, Neuigkeit diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb index 31b4a42..21fe98c 100755 --- a/app/models/neuigkeit.rb +++ b/app/models/neuigkeit.rb @@ -50,7 +50,13 @@ self.title end def text_first_words md = /

(?[\w\s,\.!\?]*)/.match self.text - md[:text].split(" ")[0..100].join(" ")+ " ..." unless md[:text].split(" ").empty? + words=md[:text].split(" ") unless md.nil? + if words.nil? || words.empty? + "...." + else + words[0..100].join(" ")+ " ..." unless words.nil? + + end end def has_calentries? !self.calentries.nil? && !self.calentries.empty? diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb index b0a0ead..9781e9f 100755 --- a/app/views/neuigkeiten/show.html.erb +++ b/app/views/neuigkeiten/show.html.erb @@ -1,6 +1,7 @@ <%= render 'rubriken/tabs' %> +

<%= notice %>

- +
<%= @neuigkeit.rubrik.name %> @@ -22,7 +23,10 @@

+ <% @calentries1.each do |ce|%> <%= render ce unless ce.nil? %> <% end %> <%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %> + + diff --git a/app/views/rubriken/index.html.erb b/app/views/rubriken/index.html.erb index 1dca821..1cd9149 100755 --- a/app/views/rubriken/index.html.erb +++ b/app/views/rubriken/index.html.erb @@ -14,7 +14,7 @@