diff --git a/app/models/ability.rb b/app/models/ability.rb index 8d8e51b..35084d1 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -63,7 +63,7 @@ class Ability end if( user.has_role?("fetuser") || user.has_role?("fetadmin")) can :manage, Gallery - can :show, Foto + can :manage, Foto end unless user.has_role?("fetadmin") cannot :delete, Gallery diff --git a/app/views/fetprofiles/show.html.erb b/app/views/fetprofiles/show.html.erb index f3e656c..9446b39 100644 --- a/app/views/fetprofiles/show.html.erb +++ b/app/views/fetprofiles/show.html.erb @@ -1,5 +1,5 @@ <%= content_for :header do %> -
<%= notice %>
-+
<%= @fetprofile.fetmail %>
-+
<%= @fetprofile.desc %>
<%= render partial: "interninfo", object: @fetprofile if can?(:seeintern, @fetprofile) %> diff --git a/app/views/neuigkeiten/_compact.html.erb b/app/views/neuigkeiten/_compact.html.erb index c9eabd9..14fc995 100644 --- a/app/views/neuigkeiten/_compact.html.erb +++ b/app/views/neuigkeiten/_compact.html.erb @@ -1,27 +1,32 @@ -
<%= image_tag neuigkeit.picture.thumb.url unless neuigkeit.picture.url.nil? %>
-
+<% unless neuigkeit.picture.url.nil? %><%= image_tag neuigkeit.picture.thumb.url %>
+ <% end %>
<%= notice %>
<% link_to "Zurück", @thema.themengruppe %> + + <% thema=@thema %>