forked from bofh/fetsite
Einrückungen
This commit is contained in:
@@ -21,6 +21,7 @@ class SemestersController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@semester = Semester.new(params[:semester])
|
@semester = Semester.new(params[:semester])
|
||||||
|
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
if @semester.save
|
if @semester.save
|
||||||
format.html { redirect_to @semester, notice: 'Semester was successfully created.' }
|
format.html { redirect_to @semester, notice: 'Semester was successfully created.' }
|
||||||
@@ -45,7 +46,7 @@ class SemestersController < ApplicationController
|
|||||||
def destroy
|
def destroy
|
||||||
@semester = Semester.find(params[:id])
|
@semester = Semester.find(params[:id])
|
||||||
@semester.destroy
|
@semester.destroy
|
||||||
redirect_to semester_url
|
redirect_to semester_url
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -46,9 +46,9 @@ class Lva < ActiveRecord::Base
|
|||||||
end
|
end
|
||||||
private
|
private
|
||||||
|
|
||||||
##
|
##
|
||||||
# Lade Daten aus TISS und füge diese in die Datenbank ein.
|
# Lade Daten aus TISS und füge diese in die Datenbank ein.
|
||||||
def load_tissdata
|
def load_tissdata
|
||||||
url= "https://tiss.tuwien.ac.at/api/course/"+ self.lvanr.to_s+"-2012W"
|
url= "https://tiss.tuwien.ac.at/api/course/"+ self.lvanr.to_s+"-2012W"
|
||||||
begin
|
begin
|
||||||
@hash=Hash.from_xml(open(url).read)["tuvienna"]
|
@hash=Hash.from_xml(open(url).read)["tuvienna"]
|
||||||
@@ -62,7 +62,7 @@ def load_tissdata
|
|||||||
end
|
end
|
||||||
rescue OpenURI::HTTPError => e
|
rescue OpenURI::HTTPError => e
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ class Modul < ActiveRecord::Base
|
|||||||
has_and_belongs_to_many :lvas
|
has_and_belongs_to_many :lvas
|
||||||
has_and_belongs_to_many :modulgruppen
|
has_and_belongs_to_many :modulgruppen
|
||||||
|
|
||||||
|
|
||||||
validates :modulgruppen, :presence=>true # Ein Modul muss zu einer Modulgruppe gehören
|
validates :modulgruppen, :presence=>true # Ein Modul muss zu einer Modulgruppe gehören
|
||||||
validates :name, :presence=>true # Ein Modul muss einen Namen haben
|
validates :name, :presence=>true # Ein Modul muss einen Namen haben
|
||||||
translates :desc,:depend,:name, :versioning =>true, :fallbacks_for_empty_translations => true
|
translates :desc,:depend,:name, :versioning =>true, :fallbacks_for_empty_translations => true
|
||||||
|
|||||||
Reference in New Issue
Block a user