forked from bofh/fetsite
Bug fix in Studie new View
This commit is contained in:
34
Gemfile.lock
34
Gemfile.lock
@@ -34,7 +34,7 @@ GEM
|
||||
bootstrap-sass (2.2.2.0)
|
||||
sass (~> 3.2)
|
||||
builder (3.0.4)
|
||||
cancan (1.6.8)
|
||||
cancan (1.6.9)
|
||||
coffee-rails (3.2.2)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (~> 3.2.0)
|
||||
@@ -42,7 +42,7 @@ GEM
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.4.0)
|
||||
devise (2.2.1)
|
||||
devise (2.2.3)
|
||||
bcrypt-ruby (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (~> 3.1)
|
||||
@@ -62,24 +62,26 @@ GEM
|
||||
hike (1.2.1)
|
||||
i18n (0.6.1)
|
||||
journey (1.0.4)
|
||||
jquery-rails (2.1.4)
|
||||
jquery-rails (2.2.1)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.7.7)
|
||||
libv8 (3.11.8.13)
|
||||
mail (2.4.4)
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
mime-types (1.19)
|
||||
multi_json (1.5.0)
|
||||
mime-types (1.21)
|
||||
multi_json (1.5.1)
|
||||
orm_adapter (0.4.0)
|
||||
paper_trail (2.7.0)
|
||||
activerecord (~> 3.0)
|
||||
railties (~> 3.0)
|
||||
polyglot (0.3.3)
|
||||
rack (1.4.3)
|
||||
rack (1.4.5)
|
||||
rack-cache (1.2)
|
||||
rack (>= 0.4)
|
||||
rack-ssl (1.3.2)
|
||||
rack-ssl (1.3.3)
|
||||
rack
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
@@ -99,10 +101,12 @@ GEM
|
||||
rdoc (~> 3.4)
|
||||
thor (>= 0.14.6, < 2.0)
|
||||
rake (10.0.3)
|
||||
rdoc (3.9.4)
|
||||
rdoc (3.12.1)
|
||||
json (~> 1.4)
|
||||
ref (1.0.2)
|
||||
rolify (3.2.0)
|
||||
sass (3.2.3)
|
||||
sass-rails (3.2.5)
|
||||
sass (3.2.5)
|
||||
sass-rails (3.2.6)
|
||||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3)
|
||||
@@ -111,9 +115,12 @@ GEM
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sqlite3 (1.3.6)
|
||||
sqlite3 (1.3.6-x86-mingw32)
|
||||
thor (0.16.0)
|
||||
sqlite3 (1.3.7)
|
||||
sqlite3 (1.3.7-x86-mingw32)
|
||||
therubyracer (0.11.3)
|
||||
libv8 (~> 3.11.8.12)
|
||||
ref
|
||||
thor (0.17.0)
|
||||
tilt (1.3.3)
|
||||
tinymce-rails (3.5.8)
|
||||
railties (>= 3.1.1)
|
||||
@@ -128,6 +135,7 @@ GEM
|
||||
rack (>= 1.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
x86-mingw32
|
||||
|
||||
DEPENDENCIES
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
|
||||
<%= render 'form' %>
|
||||
|
||||
<%= link_to 'Back', studien_index_path , :data=>{:locale=>I16n.locale}%>
|
||||
<%= link_to 'Back', studien_path , :data=>{:locale=>I18n.locale}%>
|
||||
|
||||
14
db/schema.rb
14
db/schema.rb
@@ -30,9 +30,10 @@ ActiveRecord::Schema.define(:version => 20130124223508) do
|
||||
t.decimal "ects"
|
||||
t.string "lvanr"
|
||||
t.decimal "stunden"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
t.integer "modul_id"
|
||||
t.integer "semester_id"
|
||||
end
|
||||
|
||||
create_table "lvas_moduls", :id => false, :force => true do |t|
|
||||
@@ -83,10 +84,9 @@ ActiveRecord::Schema.define(:version => 20130124223508) do
|
||||
create_table "moduls", :force => true do |t|
|
||||
t.string "name"
|
||||
t.text "desc"
|
||||
t.text "depend"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
t.text "depend"
|
||||
t.integer "studium_id"
|
||||
end
|
||||
|
||||
create_table "neuigkeiten", :force => true do |t|
|
||||
@@ -120,8 +120,8 @@ ActiveRecord::Schema.define(:version => 20130124223508) do
|
||||
create_table "semesters", :force => true do |t|
|
||||
t.string "name"
|
||||
t.integer "nummer"
|
||||
t.boolean "ws"
|
||||
t.boolean "ss"
|
||||
t.integer "studium_id"
|
||||
t.string "ssws"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
end
|
||||
@@ -129,6 +129,7 @@ ActiveRecord::Schema.define(:version => 20130124223508) do
|
||||
create_table "studien", :force => true do |t|
|
||||
t.string "zahl"
|
||||
t.string "name"
|
||||
t.text "shortdesc"
|
||||
t.text "desc"
|
||||
t.string "typ"
|
||||
t.datetime "created_at", :null => false
|
||||
@@ -138,6 +139,7 @@ ActiveRecord::Schema.define(:version => 20130124223508) do
|
||||
create_table "studium_translations", :force => true do |t|
|
||||
t.string "locale"
|
||||
t.text "desc"
|
||||
t.text "shortdesc"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
t.integer "studien_id"
|
||||
|
||||
Reference in New Issue
Block a user