Merge remote-tracking branch 'thomasb/master'

app/models/beispiel.rb

@@ -16,8 +16,7 @@
 
 class Beispiel < ActiveRecord::Base
   has_paper_trail
-  attr_accessible :desc, :name, :file, :lva_id
-  has_attached_file :file
+  attr_accessible :desc, :name, :lva_id, :beispieldatei, :beispieldatei_cache
   belongs_to :lva
-  translates :desc,  :fallbacks_for_empty_translations => true
+  mount_uploader :beispieldatei, BeispieldateiUploader
 end

app/models/lva.rb

@@ -36,19 +36,19 @@ private
 ##
 # Lade Daten aus TISS und füge diese in die Datenbank ein. 
 def load_tissdata
-	url= "https://tiss.tuwien.ac.at/api/course/"+ self.lvanr.to_s+"-2012W"
-   	begin 
-   		@hash=Hash.from_xml(open(url).read)["tuvienna"]
-  		@person=[] 
-  		if @hash["course"]["lecturers"]["oid"].is_a? String
-  			@person = @hash["course"]["lecturers"]["oid"]
-  		else
-  			@hash["course"]["lecturers"]["oid"].each do |pid|
-    				@person << Hash.from_xml(open("https://tiss.tuwien.ac.at/adressbuch/adressbuch/person_via_oid/" + pid.to_s + ".xml").read)["tuvienna"]["person"]
-  			end
-  		end
- 	rescue OpenURI::HTTPError => e
-   	end 
+  url= "https://tiss.tuwien.ac.at/api/course/"+ self.lvanr.to_s+"-2012W"
+  begin 
+    @hash=Hash.from_xml(open(url).read)["tuvienna"]
+    @person=[] 
+    if @hash["course"]["lecturers"]["oid"].is_a? String
+      @person = @hash["course"]["lecturers"]["oid"]
+    else
+      @hash["course"]["lecturers"]["oid"].each do |pid|
+        @person << Hash.from_xml(open("https://tiss.tuwien.ac.at/adressbuch/adressbuch/person_via_oid/" + pid.to_s + ".xml").read)["tuvienna"]["person"]
+      end
+    end
+  rescue OpenURI::HTTPError => e
+  end 
 end
 
 

app/models/modul.rb

@@ -1,4 +1,4 @@
-# -*- coding: undecided -*-
+# -*- coding: utf-8 -*-
 # == Schema Information
 #
 # Table name: moduls