From 8d347886c766a1562c43cf8a3b788e0a2c1ebf39 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Wed, 16 Jul 2014 06:00:14 +0200
Subject: [PATCH 1/2] Gremium deletes memberships if deleted

---
 app/models/ability.rb | 1 +
 app/models/gremium.rb | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 91c4509..ec614fa 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -70,6 +70,7 @@ class Ability
       cannot :delete, Fetprofile
       cannot :delete, Studium
       cannot :delete, Modul
+      cannot :delete ,Gremium
      end
     # Rechteverwaltung fuer Neuigkeiten
 
diff --git a/app/models/gremium.rb b/app/models/gremium.rb
index 3fd6acf..aef3387 100644
--- a/app/models/gremium.rb
+++ b/app/models/gremium.rb
@@ -20,8 +20,8 @@ class Gremium < ActiveRecord::Base
   TEXT={11=>I18n.t("gremium.filter.berufung.text"),12=>I18n.t("gremium.filter.habil.text")}
 
   attr_accessible :desc, :name, :typ, :geschlecht,:thema_id, :memberships_attributes
-  has_many :memberships # Mitgliedschaften bei dem Gremium
-  has_many :nlinks, as: :link
+  has_many :memberships, dependent: :destroy # Mitgliedschaften bei dem Gremium
+  has_many :nlinks, as: :link, dependent: :destroy
   scope :search, ->(query) {where("gremien.name like ? or gremien.desc like ?", "%#{query}%", "%#{query}%")}
 
   belongs_to :thema # Gehört zu einem Thema

From dce0b1507ed39002799dc977d44df23b9945b6a5 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Thu, 17 Jul 2014 14:08:58 +0200
Subject: [PATCH 2/2] uploader

---
 app/controllers/beispiele_controller.rb |  2 +-
 app/models/thema.rb                     |  2 +-
 app/uploaders/attachment_uploader.rb    | 38 ++++++++++++++++++++-----
 app/views/layouts/application.html.erb  |  2 +-
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/app/controllers/beispiele_controller.rb b/app/controllers/beispiele_controller.rb
index 286e91e..ed0b475 100755
--- a/app/controllers/beispiele_controller.rb
+++ b/app/controllers/beispiele_controller.rb
@@ -44,7 +44,7 @@ class BeispieleController < ApplicationController
     params.delete(:lva_id)
     @beispiel = Beispiel.new(params[:beispiel])
     @beispiel.lva=@lva
- logger.info "New Beispiel: #{params.inspect}"
+    logger.info "New Beispiel: #{params.inspect}"
  
 #    @backlink = @beispiel.lva.nil? ? root_url : lva_path(@beispiel.lva)
       @beispiel.name=@beispiel.beispieldatei.filename
diff --git a/app/models/thema.rb b/app/models/thema.rb
index 9dbc511..3f73b38 100644
--- a/app/models/thema.rb
+++ b/app/models/thema.rb
@@ -30,7 +30,7 @@ include Rails.application.routes.url_helpers
    unless translation.try(:updated_at).nil?
     translation.updated_at < 2.month.ago
    else
-     true
+     false
    end
   end
   def is_wiki?
diff --git a/app/uploaders/attachment_uploader.rb b/app/uploaders/attachment_uploader.rb
index be7212e..9327b67 100644
--- a/app/uploaders/attachment_uploader.rb
+++ b/app/uploaders/attachment_uploader.rb
@@ -19,15 +19,39 @@ end
   def store_dir
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
+  def cover 
+    manipulate! do |frame, index|
+      index== 0 ? frame.convert(:jpg) : nil
+      
+    end
+  end 
+  version :thumb do
+    process :cover
+    process :resize_to_fill => [64, 64]
 
-   version :thumb do
-     process :resize_to_fill => [64, 64]
-   end
-   version :thumb_small do
-     process :resize_to_fill => [32, 32]
-   end
+    def full_filename(for_file)
+      super.chomp(File.extname(super)) + '.jpg'
+    end 
+  end
+  version :cover do
+    process :cover
+    process :resize_to_fit => [64,64]
+    process :convert => :jpg
+    def full_filename(for_file)
+      super.chomp(File.extname(super)) + '.jpg'
+    end
+  end
+  version :thumb_small do
+    process :resize_to_fill => [32, 32]
+  end
   version :thumb_big do
-    process :resize_to_fill => [200,200]
+    process :cover
+    process :resize_to_fill => [200, 200]
+    process :convert => :jpg
+    def full_filename(for_file)
+      super.chomp(File.extname(super)) + '.jpg'
+    end 
+
   end
   version :resized do
     process :resize_to_fit => [1024,1024]
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e00f27d..22b340c 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -3,7 +3,7 @@
 
  <head>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="shortcut icon" href="./public/favicon.ico"> 
+<link rel="shortcut icon" href="http://glonass.htu.tuwien.ac.at/favicon.ico"> 
  <!--<link rel="shortcut icon" href="http://www.fet.at/favicon.ico">-->
   <title>Fetsite</title>