From f917c20581313c86419583ad200c8fcffeb0abde Mon Sep 17 00:00:00 2001 From: LinguaFrancaTranslator Date: Mon, 8 Aug 2016 14:55:41 +0000 Subject: [PATCH] Fixed contact form --- app/helpers/application_helper.rb | 11 +- app/views/application/_contact.html.haml | 2 +- db/schema.rb | 862 +++++++++++------------ 3 files changed, 439 insertions(+), 436 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b199e1d..26fc685 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -217,17 +217,20 @@ module ApplicationHelper end def url_for_locale(locale, url = nil) + return url unless locale.present? + unless url.present? new_params = params.merge({action: (params[:_original_action] || params[:action])}) new_params.delete(:_original_action) if Rails.env.development? || Rails.env.test? - url = url_for(new_params.merge({lang: locale.to_s})) - else - url = url_for(new_params) + return url_for(new_params.merge({lang: locale.to_s})) end - end + subdomain = Rails.env.preview? ? "preview-#{locale.to_s}" : locale.to_s + return url_for(new_params.merge(host: "#{subdomain}.bikebike.org")) + end + return url if Rails.env.development? || Rails.env.test? return "https://preview-#{locale.to_s}.bikebike.org#{url}" if Rails.env.preview? "https://#{locale.to_s}.bikebike.org#{url}" diff --git a/app/views/application/_contact.html.haml b/app/views/application/_contact.html.haml index 0b5c51c..1b15399 100644 --- a/app/views/application/_contact.html.haml +++ b/app/views/application/_contact.html.haml @@ -1,6 +1,6 @@ - contact_reason ||= nil - locale ||= nil -= form_tag (locale.present? ? contact_send_url : url_for_locale(locale, contact_send_url)), class: 'contact-form' do += form_tag (locale.present? ? contact_send_url : url_for_locale(locale, contact_send_path)), class: 'contact-form' do = emailfield :email, nil, big: true, required: true unless logged_in? - if contact_reason.present? = hidden_field_tag :reason, contact_reason diff --git a/db/schema.rb b/db/schema.rb index bd7caa5..8c5d798 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,431 +1,431 @@ -# 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 that you check this file into your version control system. - -ActiveRecord::Schema.define(version: 20160708042511) do - - # These are extensions that must be enabled in order to support this database - enable_extension "plpgsql" - - create_table "authentications", force: :cascade do |t| - t.integer "user_id", null: false - t.string "provider", null: false - t.string "uid", null: false - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "comments", force: :cascade do |t| - t.string "model_type" - t.integer "model_id" - t.text "comment" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "user_id" - end - - create_table "conference_admins", force: :cascade do |t| - t.integer "conference_id" - t.integer "user_id" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "conference_host_organizations", force: :cascade do |t| - t.integer "conference_id" - t.integer "organization_id" - t.integer "order" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "conference_registration_form_fields", force: :cascade do |t| - t.integer "conference_id" - t.integer "registration_form_field_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "position" - end - - create_table "conference_registration_responses", force: :cascade do |t| - t.integer "conference_registration_id" - t.integer "registration_form_field_id" - t.text "data" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "conference_registrations", force: :cascade do |t| - t.integer "conference_id" - t.integer "user_id" - t.string "is_attending" - t.datetime "created_at" - t.datetime "updated_at" - t.boolean "is_confirmed" - t.boolean "is_participant" - t.boolean "is_volunteer" - t.string "confirmation_token" - t.binary "data" - t.string "email" - t.boolean "complete" - t.boolean "completed" - t.string "payment_confirmation_token" - t.string "payment_info" - t.integer "registration_fees_paid" - t.string "city" - t.datetime "arrival" - t.datetime "departure" - t.string "housing" - t.string "bike" - t.text "other" - t.string "allergies" - t.string "languages" - t.string "food" - t.string "highest_step" - t.json "steps_completed" - t.boolean "can_provide_housing" - t.json "housing_data" - end - - create_table "conference_types", force: :cascade do |t| - t.string "title" - t.string "info" - t.datetime "created_at" - t.datetime "updated_at" - t.string "slug" - end - - create_table "conferences", force: :cascade do |t| - t.string "title" - t.string "slug" - t.datetime "start_date" - t.datetime "end_date" - t.text "info" - t.string "poster" - t.string "cover" - t.boolean "workshop_schedule_published" - t.boolean "registration_open" - t.boolean "meals_provided" - t.text "meal_info" - t.text "travel_info" - t.integer "conference_type_id" - t.datetime "created_at" - t.datetime "updated_at" - t.text "preregistration_info" - t.text "registration_info" - t.text "postregistration_info" - t.integer "cover_attribution_id" - t.string "cover_attribution_name" - t.string "cover_attribution_src" - t.integer "cover_attribution_user_id" - t.string "locale" - t.string "email_address" - t.string "paypal_email_address" - t.string "paypal_username" - t.string "paypal_password" - t.string "paypal_signature" - t.string "day_parts" - t.string "registration_status" - t.json "meals" - t.json "workshop_blocks" - end - - create_table "delayed_jobs", force: :cascade do |t| - t.integer "priority", default: 0, null: false - t.integer "attempts", default: 0, null: false - t.text "handler", null: false - t.text "last_error" - t.datetime "run_at" - t.datetime "locked_at" - t.datetime "failed_at" - t.string "locked_by" - t.string "queue" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree - - create_table "dynamic_translation_records", force: :cascade do |t| - t.string "locale" - t.integer "translator_id" - t.string "model_type" - t.integer "model_id" - t.string "column" - t.text "value" - t.datetime "created_at" - end - - create_table "email_confirmations", force: :cascade do |t| - t.string "token" - t.integer "user_id" - t.datetime "expiry" - t.string "url" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - create_table "event_locations", force: :cascade do |t| - t.string "title" - t.integer "conference_id" - t.float "latitude" - t.float "longitude" - t.string "address" - t.string "amenities" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "space" - end - - create_table "event_types", force: :cascade do |t| - t.string "slug" - t.text "info" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "events", force: :cascade do |t| - t.string "title" - t.string "slug" - t.integer "event_type_id" - t.integer "conference_id" - t.text "info" - t.integer "location_id" - t.datetime "start_time" - t.datetime "end_time" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "event_location_id" - t.string "event_type" - t.string "locale" - end - - create_table "locations", force: :cascade do |t| - t.string "title" - t.float "latitude" - t.float "longitude" - t.datetime "created_at" - t.datetime "updated_at" - t.string "country" - t.string "territory" - t.string "city" - t.string "street" - t.string "postal_code" - end - - add_index "locations", ["latitude", "longitude"], name: "index_locations_on_latitude_and_longitude", using: :btree - - create_table "locations_organizations", id: false, force: :cascade do |t| - t.integer "organization_id" - t.integer "location_id" - end - - add_index "locations_organizations", ["organization_id", "location_id"], name: "loc_org_index", using: :btree - - create_table "organization_statuses", force: :cascade do |t| - t.string "name" - t.string "slug" - t.string "info" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "organizations", force: :cascade do |t| - t.string "name" - t.string "slug" - t.string "email_address" - t.string "url" - t.integer "year_founded" - t.text "info" - t.string "logo" - t.string "avatar" - t.boolean "requires_approval" - t.string "secret_question" - t.string "secret_answer" - t.integer "user_organization_replationship_id" - t.datetime "created_at" - t.datetime "updated_at" - t.string "cover" - t.integer "cover_attribution_id" - t.string "cover_attribution_name" - t.string "cover_attribution_src" - t.string "phone" - t.integer "organization_status_id" - t.integer "cover_attribution_user_id" - t.string "status" - end - - create_table "registration_form_fields", force: :cascade do |t| - t.string "title" - t.text "help" - t.boolean "required" - t.string "field_type" - t.string "options" - t.boolean "is_retired" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "sessions", force: :cascade do |t| - t.string "session_id", null: false - t.text "data" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", unique: true, using: :btree - add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree - - create_table "translation_records", force: :cascade do |t| - t.string "locale" - t.integer "translator_id" - t.string "key" - t.text "value" - t.date "created_at" - end - - create_table "translations", force: :cascade do |t| - t.string "locale" - t.string "key" - t.text "value" - t.text "interpolations" - t.boolean "is_proc", default: false - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "user_organization_relationships", force: :cascade do |t| - t.integer "user_id" - t.integer "organization_id" - t.string "relationship" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "users", force: :cascade do |t| - t.string "username" - t.string "email" - t.string "crypted_password" - t.string "salt" - t.datetime "created_at" - t.datetime "updated_at" - t.string "remember_me_token" - t.datetime "remember_me_token_expires_at" - t.string "reset_password_token" - t.datetime "reset_password_token_expires_at" - t.datetime "reset_password_email_sent_at" - t.string "activation_state" - t.string "activation_token" - t.datetime "activation_token_expires_at" - t.integer "failed_logins_count", default: 0 - t.datetime "lock_expires_at" - t.string "unlock_token" - t.string "avatar" - t.text "about_me" - t.string "role" - t.string "firstname" - t.string "lastname" - t.boolean "is_translator" - t.json "languages" - t.string "locale" - t.boolean "is_subscribed" - end - - add_index "users", ["activation_token"], name: "index_users_on_activation_token", using: :btree - add_index "users", ["remember_me_token"], name: "index_users_on_remember_me_token", using: :btree - add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", using: :btree - - create_table "versions", force: :cascade do |t| - t.string "item_type" - t.integer "item_id" - t.string "event" - t.string "whodunnit" - t.text "object" - t.datetime "created_at" - t.string "value" - end - - create_table "workshop_facilitators", force: :cascade do |t| - t.integer "user_id" - t.integer "workshop_id" - t.string "role" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "workshop_interests", force: :cascade do |t| - t.integer "workshop_id" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - create_table "workshop_presentation_styles", force: :cascade do |t| - t.string "name" - t.string "slug" - t.string "info" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "order" - end - - create_table "workshop_requested_resources", force: :cascade do |t| - t.integer "workshop_id" - t.integer "workshop_resource_id" - t.string "status" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "workshop_resources", force: :cascade do |t| - t.string "name" - t.string "slug" - t.string "info" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "workshop_streams", force: :cascade do |t| - t.string "name" - t.string "slug" - t.string "info" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "order" - end - - create_table "workshops", force: :cascade do |t| - t.string "title" - t.string "slug" - t.text "info" - t.integer "conference_id" - t.integer "workshop_stream_id" - t.integer "workshop_presentation_style" - t.integer "min_facilitators" - t.integer "location_id" - t.datetime "start_time" - t.datetime "end_time" - t.datetime "created_at" - t.datetime "updated_at" - t.string "languages" - t.string "needs" - t.string "space" - t.string "theme" - t.text "host_info" - t.text "notes" - t.string "locale" - t.integer "event_location_id" - t.boolean "needs_facilitators" - t.json "block" - end - -end +# 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 that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20160708042511) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "authentications", force: :cascade do |t| + t.integer "user_id", null: false + t.string "provider", null: false + t.string "uid", null: false + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "comments", force: :cascade do |t| + t.string "model_type" + t.integer "model_id" + t.text "comment" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "user_id" + end + + create_table "conference_admins", force: :cascade do |t| + t.integer "conference_id" + t.integer "user_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "conference_host_organizations", force: :cascade do |t| + t.integer "conference_id" + t.integer "organization_id" + t.integer "order" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "conference_registration_form_fields", force: :cascade do |t| + t.integer "conference_id" + t.integer "registration_form_field_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "position" + end + + create_table "conference_registration_responses", force: :cascade do |t| + t.integer "conference_registration_id" + t.integer "registration_form_field_id" + t.text "data" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "conference_registrations", force: :cascade do |t| + t.integer "conference_id" + t.integer "user_id" + t.string "is_attending" + t.datetime "created_at" + t.datetime "updated_at" + t.boolean "is_confirmed" + t.boolean "is_participant" + t.boolean "is_volunteer" + t.string "confirmation_token" + t.binary "data" + t.string "email" + t.boolean "complete" + t.boolean "completed" + t.string "payment_confirmation_token" + t.string "payment_info" + t.integer "registration_fees_paid" + t.string "city" + t.datetime "arrival" + t.datetime "departure" + t.string "housing" + t.string "bike" + t.text "other" + t.string "allergies" + t.string "languages" + t.string "food" + t.string "highest_step" + t.json "steps_completed" + t.boolean "can_provide_housing" + t.json "housing_data" + end + + create_table "conference_types", force: :cascade do |t| + t.string "title" + t.string "info" + t.datetime "created_at" + t.datetime "updated_at" + t.string "slug" + end + + create_table "conferences", force: :cascade do |t| + t.string "title" + t.string "slug" + t.datetime "start_date" + t.datetime "end_date" + t.text "info" + t.string "poster" + t.string "cover" + t.boolean "workshop_schedule_published" + t.boolean "registration_open" + t.boolean "meals_provided" + t.text "meal_info" + t.text "travel_info" + t.integer "conference_type_id" + t.datetime "created_at" + t.datetime "updated_at" + t.text "preregistration_info" + t.text "registration_info" + t.text "postregistration_info" + t.integer "cover_attribution_id" + t.string "cover_attribution_name" + t.string "cover_attribution_src" + t.integer "cover_attribution_user_id" + t.string "locale" + t.string "email_address" + t.string "paypal_email_address" + t.string "paypal_username" + t.string "paypal_password" + t.string "paypal_signature" + t.string "day_parts" + t.string "registration_status" + t.json "meals" + t.json "workshop_blocks" + end + + create_table "delayed_jobs", force: :cascade do |t| + t.integer "priority", default: 0, null: false + t.integer "attempts", default: 0, null: false + t.text "handler", null: false + t.text "last_error" + t.datetime "run_at" + t.datetime "locked_at" + t.datetime "failed_at" + t.string "locked_by" + t.string "queue" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree + + create_table "dynamic_translation_records", force: :cascade do |t| + t.string "locale" + t.integer "translator_id" + t.string "model_type" + t.integer "model_id" + t.string "column" + t.text "value" + t.datetime "created_at" + end + + create_table "email_confirmations", force: :cascade do |t| + t.string "token" + t.integer "user_id" + t.datetime "expiry" + t.string "url" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "event_locations", force: :cascade do |t| + t.string "title" + t.integer "conference_id" + t.float "latitude" + t.float "longitude" + t.string "address" + t.string "amenities" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "space" + end + + create_table "event_types", force: :cascade do |t| + t.string "slug" + t.text "info" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "events", force: :cascade do |t| + t.string "title" + t.string "slug" + t.integer "event_type_id" + t.integer "conference_id" + t.text "info" + t.integer "location_id" + t.datetime "start_time" + t.datetime "end_time" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "event_location_id" + t.string "event_type" + t.string "locale" + end + + create_table "locations", force: :cascade do |t| + t.string "title" + t.float "latitude" + t.float "longitude" + t.datetime "created_at" + t.datetime "updated_at" + t.string "country" + t.string "territory" + t.string "city" + t.string "street" + t.string "postal_code" + end + + add_index "locations", ["latitude", "longitude"], name: "index_locations_on_latitude_and_longitude", using: :btree + + create_table "locations_organizations", id: false, force: :cascade do |t| + t.integer "organization_id" + t.integer "location_id" + end + + add_index "locations_organizations", ["organization_id", "location_id"], name: "loc_org_index", using: :btree + + create_table "organization_statuses", force: :cascade do |t| + t.string "name" + t.string "slug" + t.string "info" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "organizations", force: :cascade do |t| + t.string "name" + t.string "slug" + t.string "email_address" + t.string "url" + t.integer "year_founded" + t.text "info" + t.string "logo" + t.string "avatar" + t.boolean "requires_approval" + t.string "secret_question" + t.string "secret_answer" + t.integer "user_organization_replationship_id" + t.datetime "created_at" + t.datetime "updated_at" + t.string "cover" + t.integer "cover_attribution_id" + t.string "cover_attribution_name" + t.string "cover_attribution_src" + t.string "phone" + t.integer "organization_status_id" + t.integer "cover_attribution_user_id" + t.string "status" + end + + create_table "registration_form_fields", force: :cascade do |t| + t.string "title" + t.text "help" + t.boolean "required" + t.string "field_type" + t.string "options" + t.boolean "is_retired" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "sessions", force: :cascade do |t| + t.string "session_id", null: false + t.text "data" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", unique: true, using: :btree + add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree + + create_table "translation_records", force: :cascade do |t| + t.string "locale" + t.integer "translator_id" + t.string "key" + t.text "value" + t.datetime "created_at" + end + + create_table "translations", force: :cascade do |t| + t.string "locale" + t.string "key" + t.text "value" + t.text "interpolations" + t.boolean "is_proc", default: false + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "user_organization_relationships", force: :cascade do |t| + t.integer "user_id" + t.integer "organization_id" + t.string "relationship" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "users", force: :cascade do |t| + t.string "username" + t.string "email" + t.string "crypted_password" + t.string "salt" + t.datetime "created_at" + t.datetime "updated_at" + t.string "remember_me_token" + t.datetime "remember_me_token_expires_at" + t.string "reset_password_token" + t.datetime "reset_password_token_expires_at" + t.datetime "reset_password_email_sent_at" + t.string "activation_state" + t.string "activation_token" + t.datetime "activation_token_expires_at" + t.integer "failed_logins_count", default: 0 + t.datetime "lock_expires_at" + t.string "unlock_token" + t.string "avatar" + t.text "about_me" + t.string "role" + t.string "firstname" + t.string "lastname" + t.boolean "is_translator" + t.json "languages" + t.string "locale" + t.boolean "is_subscribed" + end + + add_index "users", ["activation_token"], name: "index_users_on_activation_token", using: :btree + add_index "users", ["remember_me_token"], name: "index_users_on_remember_me_token", using: :btree + add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", using: :btree + + create_table "versions", force: :cascade do |t| + t.string "item_type" + t.integer "item_id" + t.string "event" + t.string "whodunnit" + t.text "object" + t.datetime "created_at" + t.string "value" + end + + create_table "workshop_facilitators", force: :cascade do |t| + t.integer "user_id" + t.integer "workshop_id" + t.string "role" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "workshop_interests", force: :cascade do |t| + t.integer "workshop_id" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "workshop_presentation_styles", force: :cascade do |t| + t.string "name" + t.string "slug" + t.string "info" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "order" + end + + create_table "workshop_requested_resources", force: :cascade do |t| + t.integer "workshop_id" + t.integer "workshop_resource_id" + t.string "status" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "workshop_resources", force: :cascade do |t| + t.string "name" + t.string "slug" + t.string "info" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "workshop_streams", force: :cascade do |t| + t.string "name" + t.string "slug" + t.string "info" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "order" + end + + create_table "workshops", force: :cascade do |t| + t.string "title" + t.string "slug" + t.text "info" + t.integer "conference_id" + t.integer "workshop_stream_id" + t.integer "workshop_presentation_style" + t.integer "min_facilitators" + t.integer "location_id" + t.datetime "start_time" + t.datetime "end_time" + t.datetime "created_at" + t.datetime "updated_at" + t.string "languages" + t.string "needs" + t.string "space" + t.string "theme" + t.text "host_info" + t.text "notes" + t.string "locale" + t.integer "event_location_id" + t.boolean "needs_facilitators" + t.json "block" + end + +end