diff --git a/app/views/orgas/show.html.haml b/app/views/orgas/show.html.haml index ce5291c5..85c95ece 100644 --- a/app/views/orgas/show.html.haml +++ b/app/views/orgas/show.html.haml @@ -99,6 +99,11 @@ %em.fa.fa-heartbeat = Orga.human_attribute_name :active %dd= t @orga.active.to_s + - if @orga.updated_at + %dt + %em.fa.fa-calendar + = Orga.human_attribute_name :updated_at + %dd= l @orga.updated_at.to_date, format: :long - if @events_future && @events_future.any? %dt= t '.future' diff --git a/db/migrate/20151226223947_add_created_at_and_updated_at_to_orga.rb b/db/migrate/20151226223947_add_created_at_and_updated_at_to_orga.rb new file mode 100644 index 00000000..c2f991db --- /dev/null +++ b/db/migrate/20151226223947_add_created_at_and_updated_at_to_orga.rb @@ -0,0 +1,17 @@ +# Adding created_at and updated_at to orgas +class AddCreatedAtAndUpdatedAtToOrga < ActiveRecord::Migration + def change + add_column :orgas, :created_at, :datetime + add_column :orgas, :updated_at, :datetime + + reversible do |dir| + dir.up do + # add a CHECK constraint + execute <<-SQL + UPDATE orgas + SET created_at = submission_time, updated_at = decision_time; + SQL + end + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 539b1844..b44410ec 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20151226222910) do +ActiveRecord::Schema.define(version: 20151226223947) do create_table "active_admin_comments", force: :cascade do |t| t.string "namespace", limit: 255 @@ -24,9 +24,9 @@ ActiveRecord::Schema.define(version: 20151226222910) do t.datetime "updated_at" end - add_index "active_admin_comments", ["author_type", "author_id"], name: "index_active_admin_comments_on_author_type_and_author_id", using: :btree - add_index "active_admin_comments", ["namespace"], name: "index_active_admin_comments_on_namespace", using: :btree - add_index "active_admin_comments", ["resource_type", "resource_id"], name: "index_active_admin_comments_on_resource_type_and_resource_id", using: :btree + add_index "active_admin_comments", ["author_type", "author_id"], name: "index_active_admin_comments_on_author_type_and_author_id" + add_index "active_admin_comments", ["namespace"], name: "index_active_admin_comments_on_namespace" + add_index "active_admin_comments", ["resource_type", "resource_id"], name: "index_active_admin_comments_on_resource_type_and_resource_id" create_table "admin_users", force: :cascade do |t| t.string "email", limit: 255, default: "", null: false @@ -43,8 +43,8 @@ ActiveRecord::Schema.define(version: 20151226222910) do t.datetime "updated_at" end - add_index "admin_users", ["email"], name: "index_admin_users_on_email", unique: true, using: :btree - add_index "admin_users", ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true, using: :btree + add_index "admin_users", ["email"], name: "index_admin_users_on_email", unique: true + add_index "admin_users", ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true create_table "cities", force: :cascade do |t| t.string "name", limit: 255, default: "", null: false @@ -56,7 +56,7 @@ ActiveRecord::Schema.define(version: 20151226222910) do t.float "longitude", limit: 24 end - add_index "cities", ["name"], name: "cities_name", using: :btree + add_index "cities", ["name"], name: "cities_name" create_table "events", force: :cascade do |t| t.string "title", limit: 255, default: "", null: false @@ -72,8 +72,8 @@ ActiveRecord::Schema.define(version: 20151226222910) do t.integer "moderated", limit: 4, default: 0, null: false t.string "tags", limit: 255, default: "", null: false t.string "secret", limit: 255, default: "", null: false - t.datetime "decision_time", null: false - t.datetime "submission_time", null: false + t.datetime "decision_time" + t.datetime "submission_time" t.string "moderator_mail_id", limit: 32 t.string "submitter_mail_id", limit: 32 t.text "address", limit: 65535 @@ -83,7 +83,7 @@ ActiveRecord::Schema.define(version: 20151226222910) do t.string "place_name", limit: 255 end - add_index "events", ["start_time", "end_time"], name: "events_date", using: :btree + add_index "events", ["start_time", "end_time"], name: "events_date" create_table "kinds", force: :cascade do |t| t.string "name", limit: 255, null: false @@ -100,38 +100,58 @@ ActiveRecord::Schema.define(version: 20151226222910) do end create_table "orgas", force: :cascade do |t| - t.integer "region_id", limit: 4, default: 0, null: false - t.integer "department", limit: 4 - t.string "name", limit: 255, default: "", null: false - t.string "url", limit: 255, default: "", null: false - t.string "city", limit: 255, default: "", null: false + t.integer "region_id", limit: 4, default: 0, null: false + t.integer "department", limit: 4, default: 0, null: false + t.string "name", limit: 255, default: "", null: false + t.string "url", limit: 255, default: "", null: false + t.string "city", limit: 255, default: "", null: false t.integer "kind_id", limit: 4 t.string "feed", limit: 255 t.string "contact", limit: 255 t.string "submitter", limit: 255 - t.boolean "moderated", default: false + t.boolean "moderated", limit: 1, default: false t.datetime "submission_time" t.datetime "decision_time" t.string "secret", limit: 255 - t.boolean "deleted", default: false, null: false - t.boolean "active", default: true, null: false - t.text "description", limit: 65535 - t.datetime "createdAt" - t.datetime "updatedAt" + t.boolean "deleted", limit: 1, default: false, null: false + t.boolean "active", default: true, null: false + t.text "description" + t.datetime "created_at" + t.datetime "updated_at" end - add_index "orgas", ["kind_id"], name: "index_orgas_on_kind_id", using: :btree + add_index "orgas", ["kind_id"], name: "index_orgas_on_kind_id" create_table "regions", force: :cascade do |t| t.string "name", limit: 255, default: "", null: false end + create_table "taggings", force: :cascade do |t| + t.integer "tag_id" + t.integer "taggable_id" + t.string "taggable_type", limit: 255 + t.integer "tagger_id" + t.string "tagger_type", limit: 255 + t.string "context", limit: 128 + t.datetime "created_at" + end + + add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true + add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context" + + create_table "tags", force: :cascade do |t| + t.string "name", limit: 255 + t.integer "taggings_count", default: 0 + end + + add_index "tags", ["name"], name: "index_tags_on_name", unique: true + create_table "translations", force: :cascade do |t| t.string "locale", limit: 255 t.string "key", limit: 255 t.text "value", limit: 65535 t.text "interpolations", limit: 65535 - t.boolean "is_proc", default: false + t.boolean "is_proc", limit: 1, default: false end create_table "users", force: :cascade do |t| @@ -143,14 +163,14 @@ ActiveRecord::Schema.define(version: 20151226222910) do end create_table "versions", force: :cascade do |t| - t.string "item_type", limit: 255, null: false - t.integer "item_id", limit: 4, null: false - t.string "event", limit: 255, null: false - t.string "whodunnit", limit: 255 - t.text "object", limit: 65535 + 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" end - add_index "versions", ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id", using: :btree + add_index "versions", ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id" end