From 8b33dd27a44403b2619b79c89b49d5f9243ab5ae Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Thu, 15 Aug 2013 12:44:04 +0200 Subject: [PATCH 1/3] auth --- app/views/neuigkeiten/_form.html.erb | 1 + app/views/neuigkeiten/edit.html.erb | 2 +- db/schema.rb | 17 +++++++++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/views/neuigkeiten/_form.html.erb b/app/views/neuigkeiten/_form.html.erb index 3b075c9..f04ce43 100755 --- a/app/views/neuigkeiten/_form.html.erb +++ b/app/views/neuigkeiten/_form.html.erb @@ -5,6 +5,7 @@ <%= f.input :text, :as=>:tinymce_text %> <%= f.input :datum %> <%= f.input :rubrik, :as=>:radio, :collection=>Rubrik.all %> + <%= f.input :author, :as=>:radio %> <% end %> <%= f.actions do %> diff --git a/app/views/neuigkeiten/edit.html.erb b/app/views/neuigkeiten/edit.html.erb index a6c5a21..1e36ba0 100755 --- a/app/views/neuigkeiten/edit.html.erb +++ b/app/views/neuigkeiten/edit.html.erb @@ -1,5 +1,5 @@

Editing neuigkeit

- +<%= %> <%= render 'form' %> <%= link_to 'Show', @neuigkeit %> | diff --git a/db/schema.rb b/db/schema.rb index 95500ad..330da3c 100755 --- a/db/schema.rb +++ b/db/schema.rb @@ -20,6 +20,16 @@ ActiveRecord::Schema.define(:version => 20130813145651) do t.integer "thema_id" end + create_table "beispiel_translations", :force => true do |t| + t.string "locale" + t.text "desc" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "beispiele_id" + end + + add_index "beispiel_translations", ["locale"], :name => "index_beispiel_translations_on_locale" + create_table "beispiele", :force => true do |t| t.string "name" t.text "desc" @@ -104,11 +114,14 @@ ActiveRecord::Schema.define(:version => 20130813145651) do t.integer "modul_id" end - create_table "lvas_semesters", :force => true do |t| + create_table "lvas_semesters", :id => false, :force => true do |t| t.integer "lva_id" t.integer "semester_id" end + add_index "lvas_semesters", ["lva_id", "semester_id"], :name => "index_lvas_semesters_on_lva_id_and_semester_id" + add_index "lvas_semesters", ["semester_id"], :name => "index_lvas_semesters_on_semester_id" + create_table "modul_translations", :force => true do |t| t.integer "modul_id" t.string "locale" @@ -222,7 +235,7 @@ ActiveRecord::Schema.define(:version => 20130813145651) do t.text "text" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - t.integer "themen_id" + t.integer "theman_id" end add_index "thema_translations", ["locale"], :name => "index_thema_translations_on_locale" From 97b28fdc6511718fb63a960a9a70aefc78e032ab Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Thu, 15 Aug 2013 12:44:22 +0200 Subject: [PATCH 2/3] rm schema --- db/schema.rb | 315 --------------------------------------------------- 1 file changed, 315 deletions(-) delete mode 100755 db/schema.rb diff --git a/db/schema.rb b/db/schema.rb deleted file mode 100755 index 330da3c..0000000 --- a/db/schema.rb +++ /dev/null @@ -1,315 +0,0 @@ -# encoding: UTF-8 -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended to check this file into your version control system. - -ActiveRecord::Schema.define(:version => 20130813145651) do - - create_table "attachments", :force => true do |t| - t.string "name" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "thema_id" - end - - create_table "beispiel_translations", :force => true do |t| - t.string "locale" - t.text "desc" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "beispiele_id" - end - - add_index "beispiel_translations", ["locale"], :name => "index_beispiel_translations_on_locale" - - create_table "beispiele", :force => true do |t| - t.string "name" - t.text "desc" - t.integer "lva_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "beispieldatei" - end - - create_table "calendars", :force => true do |t| - t.string "name" - t.boolean "public" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "picture" - end - - create_table "calendars_calentries", :id => false, :force => true do |t| - t.integer "calentry_id" - t.integer "calendar_id" - end - - add_index "calendars_calentries", ["calendar_id"], :name => "index_calendars_calentries_on_calendar_id" - add_index "calendars_calentries", ["calentry_id", "calendar_id"], :name => "index_calendars_calentries_on_calentry_id_and_calendar_id" - - create_table "calentries", :force => true do |t| - t.datetime "start" - t.datetime "ende" - t.string "summary" - t.integer "typ" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "frage_translations", :force => true do |t| - t.string "locale" - t.string "title" - t.text "text" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "fragen_id" - end - - add_index "frage_translations", ["locale"], :name => "index_frage_translations_on_locale" - - create_table "fragen", :force => true do |t| - t.string "title" - t.text "text" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "thema_id" - end - - create_table "lva_translations", :force => true do |t| - t.integer "lva_id" - t.string "locale" - t.text "desc" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "lva_translations", ["locale"], :name => "index_lva_translations_on_locale" - add_index "lva_translations", ["lva_id"], :name => "index_lva_translations_on_lva_id" - - create_table "lvas", :force => true do |t| - t.string "name" - t.text "desc" - t.decimal "ects" - t.string "lvanr" - t.decimal "stunden" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "modul_id" - t.integer "semester_id" - t.text "pruefungsinformation" - t.text "lernaufwand" - t.string "typ" - end - - create_table "lvas_moduls", :id => false, :force => true do |t| - t.integer "lva_id" - t.integer "modul_id" - end - - create_table "lvas_semesters", :id => false, :force => true do |t| - t.integer "lva_id" - t.integer "semester_id" - end - - add_index "lvas_semesters", ["lva_id", "semester_id"], :name => "index_lvas_semesters_on_lva_id_and_semester_id" - add_index "lvas_semesters", ["semester_id"], :name => "index_lvas_semesters_on_semester_id" - - create_table "modul_translations", :force => true do |t| - t.integer "modul_id" - t.string "locale" - t.text "desc" - t.text "depend" - t.string "name" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "modul_translations", ["locale"], :name => "index_modul_translations_on_locale" - add_index "modul_translations", ["modul_id"], :name => "index_modul_translations_on_modul_id" - - create_table "modulgruppe_translations", :force => true do |t| - t.integer "modulgruppe_id" - t.string "locale" - t.text "desc" - t.string "name" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "modulgruppe_translations", ["locale"], :name => "index_modulgruppe_translations_on_locale" - add_index "modulgruppe_translations", ["modulgruppe_id"], :name => "index_modulgruppe_translations_on_modulgruppe_id" - - create_table "modulgruppen", :force => true do |t| - t.string "typ" - t.integer "phase" - t.string "name" - t.text "desc" - t.integer "studium_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "modulgruppen_moduls", :id => false, :force => true do |t| - t.integer "modul_id" - t.integer "modulgruppe_id" - end - - 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 - end - - create_table "neuigkeiten", :force => true do |t| - t.string "title" - t.text "text" - t.datetime "datum" - t.integer "rubrik_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "roles", :force => true do |t| - t.string "name" - t.integer "resource_id" - t.string "resource_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "roles", ["name", "resource_type", "resource_id"], :name => "index_roles_on_name_and_resource_type_and_resource_id" - add_index "roles", ["name"], :name => "index_roles_on_name" - - create_table "rubriken", :force => true do |t| - t.string "name" - t.text "desc" - t.integer "prio" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "semesters", :force => true do |t| - t.string "name" - t.integer "nummer" - t.integer "studium_id" - t.string "ssws" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - 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 - t.datetime "updated_at", :null => false - t.string "abkuerzung" - end - - 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" - end - - add_index "studium_translations", ["locale"], :name => "index_studium_translations_on_locale" - - create_table "thema_translations", :force => true do |t| - t.string "locale" - t.string "title" - t.text "text" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "theman_id" - end - - add_index "thema_translations", ["locale"], :name => "index_thema_translations_on_locale" - - create_table "themen", :force => true do |t| - t.string "title" - t.text "text" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "themengruppe_id" - end - - create_table "themengruppe_translations", :force => true do |t| - t.string "locale" - t.string "title" - t.text "text" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "themengruppen_id" - end - - add_index "themengruppe_translations", ["locale"], :name => "index_themengruppe_translations_on_locale" - - create_table "themengruppen", :force => true do |t| - t.string "title" - t.text "text" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "users", :force => true do |t| - t.string "email", :default => "", :null => false - t.string "encrypted_password", :default => "", :null => false - t.string "reset_password_token" - t.datetime "reset_password_sent_at" - t.datetime "remember_created_at" - t.integer "sign_in_count", :default => 0 - t.datetime "current_sign_in_at" - t.datetime "last_sign_in_at" - t.string "current_sign_in_ip" - t.string "last_sign_in_ip" - t.string "confirmation_token" - t.datetime "confirmed_at" - t.datetime "confirmation_sent_at" - t.string "unconfirmed_email" - t.integer "failed_attempts", :default => 0 - t.string "unlock_token" - t.datetime "locked_at" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "users", ["confirmation_token"], :name => "index_users_on_confirmation_token", :unique => true - add_index "users", ["email"], :name => "index_users_on_email", :unique => true - add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true - add_index "users", ["unlock_token"], :name => "index_users_on_unlock_token", :unique => true - - create_table "users_roles", :id => false, :force => true do |t| - t.integer "user_id" - t.integer "role_id" - end - - add_index "users_roles", ["user_id", "role_id"], :name => "index_users_roles_on_user_id_and_role_id" - - create_table "versions", :force => true do |t| - t.string "item_type", :null => false - t.integer "item_id", :null => false - t.string "event", :null => false - t.string "whodunnit" - t.text "object" - t.datetime "created_at" - t.integer "locale" - end - - add_index "versions", ["item_type", "item_id"], :name => "index_versions_on_item_type_and_item_id" - -end From 5eb9e41c71d9729e8598fd6aa9a0c14de899dfa8 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Thu, 15 Aug 2013 12:55:02 +0200 Subject: [PATCH 3/3] FIX Neuigkeiten New --- app/controllers/neuigkeiten_controller.rb | 3 ++- app/models/neuigkeit.rb | 2 +- app/views/neuigkeiten/_neuigkeit.html.erb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb index b09973e..280987e 100755 --- a/app/controllers/neuigkeiten_controller.rb +++ b/app/controllers/neuigkeiten_controller.rb @@ -27,6 +27,7 @@ class NeuigkeitenController < ApplicationController def create @neuigkeit = Neuigkeit.new(params[:neuigkeit]) @rubrik = @neuigkeit.rubrik + respond_to do |format| if @neuigkeit.save format.html { redirect_to @neuigkeit, notice: 'Neuigkeit was successfully created.' } @@ -41,7 +42,7 @@ class NeuigkeitenController < ApplicationController def update @neuigkeit = Neuigkeit.find(params[:id]) - + respond_to do |format| if @neuigkeit.update_attributes(params[:neuigkeit]) format.html { redirect_to @neuigkeit, notice: 'Neuigkeit was successfully updated.' } diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb index 5f41df6..8740d46 100755 --- a/app/models/neuigkeit.rb +++ b/app/models/neuigkeit.rb @@ -12,7 +12,7 @@ # class Neuigkeit < ActiveRecord::Base - attr_accessible :datum, :text, :title, :rubrik_id + attr_accessible :datum, :text, :title, :rubrik_id, :author_id belongs_to :author, :class_name =>'User' belongs_to :rubrik, :class_name =>'Rubrik', :foreign_key => "rubrik_id" validates :rubrik, :presence=>true diff --git a/app/views/neuigkeiten/_neuigkeit.html.erb b/app/views/neuigkeiten/_neuigkeit.html.erb index b0539c8..c3d647b 100755 --- a/app/views/neuigkeiten/_neuigkeit.html.erb +++ b/app/views/neuigkeiten/_neuigkeit.html.erb @@ -1,5 +1,5 @@

<%= link_to neuigkeit.title,neuigkeit_path(neuigkeit) %>

<%= if !neuigkeit.author.nil? - neuigkeit.author.name + neuigkeit.author.email end %>

<%= raw(neuigkeit.text) %>