From 5c8b8dcfe69112133718adcd216c90510cb84980 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 14 Feb 2015 17:26:37 +0100
Subject: [PATCH] fixes

---
 app/controllers/themengruppen_controller.rb     | 12 ++++--------
 app/views/themen/_attachment_verwalten.html.erb | 11 ++++++++++-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/controllers/themengruppen_controller.rb b/app/controllers/themengruppen_controller.rb
index d47a734..64d79ba 100644
--- a/app/controllers/themengruppen_controller.rb
+++ b/app/controllers/themengruppen_controller.rb
@@ -3,7 +3,7 @@ class ThemengruppenController < ApplicationController
   # GET /themengruppen.json
   load_and_authorize_resource
   def index
-    @themengruppen = Themengruppe.where(:public=>true).order(:priority).reverse
+    @themengruppen = Themengruppe.accessible_by(current_ability, :show).order(:priority).reverse_order
     @toolbar_elements = []
     @toolbar_elements << {:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.new'), :path=>new_themengruppe_path()} if can? :new, Themengruppe
     @toolbar_elements << {:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.manage_all'), :path=>verwalten_all_themengruppen_path()} if can? :verwalten_all, Themengruppe
@@ -22,11 +22,8 @@ class ThemengruppenController < ApplicationController
   # GET /themengruppen/1.json
   def show
     @themengruppe = Themengruppe.find(params[:id])
-    if can? :showdraft , Thema
-    @themen = @themengruppe.themen
-      else
-    @themen = @themengruppe.themen.public
-    end
+    @themen=@themengruppe.themen.accessible_by(current_ability, :show)
+   
     @toolbar_elements = []
     @toolbar_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t("themengruppe.manage"), :path=>themengruppe_verwalten_path(@themengruppe)} if can? :edit, @themengruppe
 
@@ -53,7 +50,7 @@ class ThemengruppenController < ApplicationController
   end
   def verwalten_all
     @themengruppen =Themengruppe.public.order(:priority).reverse
-@themengruppen_intern =Themengruppe.intern.order(:priority).reverse
+    @themengruppen_intern =Themengruppe.intern.order(:priority).reverse
     @toolbar_elements = [{:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.new'), :path=>new_themengruppe_path()}]
  
   end 
@@ -63,7 +60,6 @@ class ThemengruppenController < ApplicationController
     
     @toolbar_elements =[]
     @toolbar_elements << {:text=>I18n.t('themengruppe.show'), :path=>themengruppe_path(@themengruppe)} if can? :show, @themengruppe
-
     @toolbar_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('themengruppe.edit'), :path=>edit_themengruppe_path(@themengruppe)} if can? :edit, @themengruppe
     @toolbar_elements << {:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('thema.add'), :path=>new_themengruppe_thema_path(@themengruppe), :remote=>true} if can? :new, Thema
     @toolbar_elements << {:hicon=>'icon-remove-circle',:text=>I18n.t('themengruppe.remove'), :path=>themengruppe_path(@themengruppe), :method=>:delete,:confirm=>I18n.t('themengruppe.sure')} if can? :delete, @themengruppe
diff --git a/app/views/themen/_attachment_verwalten.html.erb b/app/views/themen/_attachment_verwalten.html.erb
index 8fb67c3..e4180d9 100644
--- a/app/views/themen/_attachment_verwalten.html.erb
+++ b/app/views/themen/_attachment_verwalten.html.erb
@@ -1,3 +1,12 @@
+<div>
+<b>Titlepics</b>
 
-<%= render :partial=>"attachments/form_bulk" %>
+<% @thema.titlepics.each do |tp| %>
+<%= link_to image_tag(tp.datei.thumb.url) , set_titlepic_thema_attachment_path(tp.thema,tp,:params=>{:titlepic=>false}) %>
+<% end %></div>
+<b> List </b>
 <%= render partial: "themen/attachment_list", object:@thema.attachments ,locals: {:editor => true}%>
+<div>
+<b>Form</b> 
+<%= render :partial=>"attachments/form_bulk" %>
+</div>